commit

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java

@@ -168,7 +168,7 @@ public class SysClubServiceImpl extends BaseServiceImpl<SysClub> implements SysC
 
         SysClub sysClub = dao().insertWith(club, "sponsors");
         if(ObjectUtil.isNotEmpty(managePerson)){
-            List<ClubUser> clubUsers = managePerson.stream().map(person -> {
+            List<ClubUser> 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<SysClub> implements SysC
         dao().clear(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", club.getId()));
 
         if (ObjectUtil.isNotEmpty(managePerson)) {
-            List<ClubUser> clubUsers = managePerson.stream().map(person -> {
+            List<ClubUser> 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")));

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()
                     }
                 })
         },

src/main/resources/views/platform/zhgh/activity/basic/settings/index.html

@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="基础类型备注" label-width="110px" prop="note">
-                    <el-input maxlength="100" placeholder="请输入基础类型备注" type="textarea" v-model="formData.note"></el-input>
+                    <el-input maxlength="50" placeholder="请输入基础类型备注" type="textarea" v-model="formData.note"></el-input>
                 </el-form-item>
             </el-row>
         </el-form>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
-                        <el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
                         <el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
                     </el-row>
                 </div>

src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html

@@ -71,7 +71,7 @@ layout("/layouts/platform.html"){
 								 code="UserType"></dict-select>
 				</div>-->
 
-			    <el-button type="primary" size="small" icon="el-icon-printer" @click="exportExcel">导出会员名单</el-button>
+			    <!--<el-button type="primary" size="small" icon="el-icon-printer" @click="exportExcel">导出会员名单</el-button>-->
 
 			    <el-popover
 					    placement="bottom"

src/main/resources/views/platform/zhghh5/club/clubApproval/index.html

@@ -71,7 +71,7 @@ layout("/layouts/platform_h5.html"){
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
-                <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
+                <van-button type="danger" block @click="handleTaskAction(2)">不同意</van-button>
                 <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
             </div>
         </div>

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html

@@ -78,7 +78,7 @@ layout("/layouts/platform_h5.html"){
                     </van-cell-group>
                     <van-cell-group title="电子签名" class="form-section">
                         <van-field class="more-text" name="tf_userSign" label="" required
-                                   :rules="[{ required: true,message:'请签名' }]">
+                                   v-model="formData.tf_opinion" :rules="[{ required: true,message:'请签名' }]">
                             <template #input>
                                 <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
                             </template>

src/main/resources/views/platform/zhghh5/sys/home/todo.js

@@ -46,9 +46,7 @@ const todo = {
                         title="variable.instanceName">
                 <template v-slot="{index,row}">
                     <table-column label="任务节点">{{row.taskName}}</table-column>
-                    <table-column label="流程分类">{{categoryOptions.find(item => item.id === row.category)?.name ||
-                        '未知分类'}}
-                    </table-column>
+                    <table-column label="流程分类">{{row.categoryName}}</table-column>
                     <table-column label="申请人">{{row.variable?.initiatorName || '未知'}}</table-column>
                     <table-column label="状态" v-if="activeTab === 'started'">{{processStatusMap[row.state]?.text ||
                         '未知状态'}}