diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java index cb62947..e6ca750 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java @@ -168,7 +168,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC SysClub sysClub = dao().insertWith(club, "sponsors"); if(ObjectUtil.isNotEmpty(managePerson)){ - List clubUsers = managePerson.stream().map(person -> { + List clubUsers = managePerson.stream().filter(o -> StrUtil.isNotBlank(o.getString("userId"))).map(person -> { ClubUser clubUser = new ClubUser(); clubUser.setClubId(club.getId()); clubUser.setRoleCode(List.of(person.getString("roleCode"))); @@ -193,7 +193,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC dao().clear(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", club.getId())); if (ObjectUtil.isNotEmpty(managePerson)) { - List clubUsers = managePerson.stream().map(person -> { + List clubUsers = managePerson.stream().filter(o -> StrUtil.isNotBlank(o.getString("userId"))).map(person -> { ClubUser clubUser = new ClubUser(); clubUser.setClubId(club.getId()); clubUser.setRoleCode(List.of(person.getString("roleCode"))); diff --git a/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue b/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue index 2bced5a..abda33a 100644 --- a/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue +++ b/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue @@ -91,6 +91,7 @@ module.exports = { if (res.code === 0) { this.$message.success("设置成功") this.dialogVisible = false + this.listOpinion() } }) }, diff --git a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html index 296fda7..deb8a54 100644 --- a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html +++ b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html @@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html index b3c6e7a..fd5d061 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html @@ -79,7 +79,7 @@ layout("/layouts/platform.html"){ 取消 - 不同意 + 不同意 同意 diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 27e6928..68b7f55 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -71,7 +71,7 @@ layout("/layouts/platform.html"){ code="UserType"> --> - 导出会员名单 +
退回 - 不同意 + 不同意 同意
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html index 86dcf1d..1d91bdc 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html @@ -78,7 +78,7 @@ layout("/layouts/platform_h5.html"){ + v-model="formData.tf_opinion" :rules="[{ required: true,message:'请签名' }]"> diff --git a/src/main/resources/views/platform/zhghh5/sys/home/todo.js b/src/main/resources/views/platform/zhghh5/sys/home/todo.js index 43e809f..2f1688c 100644 --- a/src/main/resources/views/platform/zhghh5/sys/home/todo.js +++ b/src/main/resources/views/platform/zhghh5/sys/home/todo.js @@ -46,9 +46,7 @@ const todo = { title="variable.instanceName">