commit

src/main/java/io/v/nutz/sys/constant/club/ClubRegistAuditState.java

@@ -13,17 +13,17 @@ public class ClubRegistAuditState {
     public static final Integer NOT_SUBMIT = 800;
 
     /**
-     * 待二级单位党委书记审核
+     * 待分工会审核
      */
     public static final Integer UNIT_PART_READY = 801;
 
     /**
-     * 二级单位党委书记退回修改
+     * 分工会退回修改
      */
     public static final Integer UNIT_PART_BACK_MODIFY = 802;
 
     /**
-     * 二级单位党委书记审核拒绝
+     * 分工会审核拒绝
      */
     public static final Integer UNIT_PART_REJECTED = 803;
 

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/examine/ClubExamineRegisterUnitPartAuditController.java

@@ -5,6 +5,7 @@ import io.v.nutz.base.model.Audit;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.base.service.BaseService;
 import io.v.nutz.base.utils.Roles;
+import io.v.nutz.base.utils.Vi;
 import io.v.nutz.sys.controllers.platform.sys.handler.ClubExamineToDoHandler;
 import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.sys.models.sys_club_examine_register;
@@ -64,7 +65,7 @@ public class ClubExamineRegisterUnitPartAuditController {
                 $condition
                 """);
         if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "xxhgly"})) {
-            cnd.and("u1.unitId", "=", ShiroUtil.getUnitId());
+            cnd.and("u1.unionId", "=", Vi.getUnionId());
         }
         cnd.andEX("YEAR(scer.registerDate)", "=", year);
         cnd.andEX("scer.clubId", "=", clubId);

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubUnitPartAuditController.java

@@ -4,6 +4,7 @@ import cn.wizzer.framework.page.Pagination;
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.model.Audit;
 import io.v.nutz.base.query.PageForm;
+import io.v.nutz.base.utils.Vi;
 import io.v.nutz.sys.constant.club.ClubRegistAuditState;
 import io.v.nutz.sys.models.Sys_club;
 import io.v.nutz.sys.services.SysClubService;
@@ -23,7 +24,7 @@ import java.util.Date;
 /**
  * @Author JyuHsin
  * @Date 2022/4/14
- * @Description 二级单位审核
+ * @Description 分工会审核
  */
 @IocBean
 @At("/platform/sys/club/unitPartAudit")
@@ -51,7 +52,7 @@ public class ClubUnitPartAuditController {
                            @Param(value = "isAudit", required = false) Boolean isAudit) {
         Cnd cnd = Cnd.NEW();
         if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "xxhgly"})) {
-            cnd.and("u.unitId", "=", ShiroUtil.getUnitId());
+            cnd.and("u.unionId", "=", Vi.getUnionId());
         }
         if (isAudit == null) {
             cnd.and("c.state", ">=", ClubRegistAuditState.UNIT_PART_READY);

src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubExamineToDoHandler.java

@@ -97,7 +97,7 @@ public enum ClubExamineToDoHandler {
                     GROUP BY
                         sur.userId
                     """);
-            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)));
+            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "in", Lang.array(Roles.club01)));
             Sql sql = Sqls.queryString(sqlStr.toString());
             dao.execute(sql);
             List<String> loginNames = sql.getList(String.class);
@@ -131,12 +131,12 @@ public enum ClubExamineToDoHandler {
         }
     },
     /**
-     * 给二级单位发任务
+     * 给分工会发任务
      */
     CREATE_UNIT_PART_TASK() {
         @Override
         public void exec(sys_club_examine_register examineRegister) {
-            //查询二级单位党委书记
+            //查询分工会
             Sql sqlStr = Sqls.create("""
                     SELECT
                         u.loginname
@@ -147,26 +147,26 @@ public enum ClubExamineToDoHandler {
                     GROUP BY
                         sur.userId
                     """);
-            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "=", Roles.GH03));
+            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "in", Lang.array(Roles.GH01, Roles.UNION_MANGER)));
             Sql sql = Sqls.queryString(sqlStr.toString());
             dao.execute(sql);
             List<String> loginNames = sql.getList(String.class);
             localProcessService.createTask(
                     "sys_club_examine_register@" + examineRegister.getId(),
                     "unitPartAuditId",
-                    "二级单位审核",
+                    "分工会审核",
                     ShiroUtil.getUserId(),
                     loginNames,
-                    "/platform/sys/club/examine/register/xghAudit",
+                    "/platform/sys/club/examine/register/unitPartAudit",
-                    "/platform/sys/club/examine/register/xghAudit",
+                    "/platform/sys/club/examine/register/unitPartAudit",
                     "",
                     ""
             );
-            localProcessService.updateProcessNodeName("sys_club_examine_register@" + examineRegister.getId(), "二级单位审核");
+            localProcessService.updateProcessNodeName("sys_club_examine_register@" + examineRegister.getId(), "分工会审核");
         }
     },
     /**
-     * 二级单位任务完成
+     * 分工会任务完成
      */
     COMPLETE_UNIT_PART_TASK() {
         @Override

src/main/java/io/v/nutz/sys/models/Sys_club.java

@@ -130,7 +130,7 @@ public class Sys_club {
     private List<Sys_club_sponsor> sponsors;
 
     @Column
-    @Comment("二级单位党委书记审核记录id")
+    @Comment("分工会审核记录id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String unitPartAuditId;
 

src/main/java/io/v/nutz/sys/models/sys_club_examine_register.java

@@ -94,7 +94,7 @@ public class sys_club_examine_register {
     private String hzAuditId;
 
     @Column
-    @Comment("二级单位审核意见id")
+    @Comment("分工会审核意见id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String unitPartAuditId;
 

src/main/resources/static/components/club/clubRegistInfo.vue

@@ -122,7 +122,7 @@
 
     </el-tab-pane>
 
-    <el-tab-pane label="二级单位党委书记审核信息" name="2" v-if="hasPane(2) && viewData.unitPartAuditId">
+    <el-tab-pane label="分工会审核信息" name="2" v-if="hasPane(2) && viewData.unitPartAuditId">
       <vi-title title="审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">

src/main/resources/static/components/club/clubRegisterInfo.vue

@@ -131,8 +131,8 @@
         </el-descriptions-item>
       </el-descriptions>
     </el-tab-pane>
-    <el-tab-pane label="二级单位审核信息" name="6" v-if="viewData.unitPartAudit">
+    <el-tab-pane label="分工会审核信息" name="6" v-if="viewData.unitPartAudit">
-      <vi-title title="二级单位审核信息"></vi-title>
+      <vi-title title="分工会审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">
           {{ viewData.unitPartAudit.username }}({{ viewData.unitPartAudit.loginname }})

src/main/resources/views/platform/sys/club/manage/clubInfoManage.html

@@ -982,6 +982,7 @@ layout("/layouts/platform.html"){
                     const resp = await $.post('/platform/sys/club/clubMyApply/doDelete', {id: id})
                     this.notifySuccess("删除成功")
                     this.doSearch()
+                    await this.loadTree()
                 }
             },
             fzrChange(id) {

src/main/resources/views/platform/sys/club/regist/clubRegistApply.html

@@ -381,6 +381,7 @@ layout("/layouts/platform.html"){
                 row.loginname = user.loginname
                 row.unitname = user.unitname
                 row.mobile = user.mobile
+                this.userOptions = []
             },
             sponsorPersonChange(val, row, index) {
                 const cloneData = clone(this.sponsorData)
@@ -398,6 +399,8 @@ layout("/layouts/platform.html"){
                 row.loginname = user.loginname
                 row.unitname = user.unitname
                 row.mobile = user.mobile
+
+                this.userOptions = []
             },
             fzrChange(id) {
                 const user = this.userOptions.find(v => {

src/main/resources/views/platform/sys/club/regist/unitPartAudit.html

@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
         </el-card>
 
         <template #edit>
-            <club-regist-info ref="info2" :handle="true" label="二级单位党委书记审核" :panes="[2]">
+            <club-regist-info ref="info2" :handle="true" label="分工会审核" :panes="[2]">
                 <template #handle>
                     <vi-title title="审核信息"></vi-title>
                     <el-form :model="formData" ref="form" :rules="formRules" label-position="right"