Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -20,6 +20,7 @@ import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.sys.services.SysUserService;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.base.Globals;
+import com.budwk.app.zhgh.staffmanage.specialstaff.model.SpecialStaff;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
@@ -369,6 +370,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
             throw new BaseException("用户不存在");
         }
         user = this.fetchLinks(user, null);
+
+        // 工会关系人员
+        SpecialStaff staff = dao().fetch(SpecialStaff.class, Cnd.where("userId", "=", userId));
+        if (Lang.isNotEmpty(staff)) {
+            Sys_union union = dao().fetch(Sys_union.class, staff.getUnionRelationUnionId());
+            if (Lang.isNotEmpty(user.getUnit())) {
+                user.getUnit().setUnionId(union.getId());
+            }
+        }
+
         if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) {
             Sys_union union = dao().fetch(Sys_union.class, user.getUnit().getUnionId());
             user.setUnion(union);
@@ -391,6 +402,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         StpUtil.checkLogin();
         // 查询一下视图，存储一些sys_user表中没有的字段
         View_user viewUser = dao().fetch(View_user.class, Cnd.where("id", "=", user.getId()));
+        // 工会关系人员
+        SpecialStaff staff = dao().fetch(SpecialStaff.class, Cnd.where("userId", "=", user.getId()));
+        if (Lang.isNotEmpty(staff)) {
+            Sys_union union = dao().fetch(Sys_union.class, viewUser.getUnionId());
+            user.setUnion(union);
+        }
+
         StpUtil.getSession(true)
                 .set("loginname", Strings.sNull(user.getLoginname()))
                 .set("username", Strings.sNull(user.getUsername()))

src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java

@@ -74,7 +74,7 @@ public class SpecialStaffManageServiceImpl extends BaseServiceImpl<SpecialStaff>
         cnd.andEX("u.unitId", "=", pageForm.getUnitId());
         cnd.andEX("u.personType", "=", pageForm.getPersonType());
         cnd.andEX("u.userState", "=", pageForm.getUserState());
-        cnd.andEX("u.personType", "=", pageForm.getPersonType());
+        cnd.andEX("u.preparedBy", "=", pageForm.getPersonType());
         cnd.andEX("s.specialStaffType", "=", pageForm.getSpecialStaffType());
         sql.setCondition(cnd);
         return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);

src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/vo/SpecialStaffVo.java

@@ -21,6 +21,8 @@ public class SpecialStaffVo {
     private String personnelRelationThreeUnitName;
     private String personnelRelationUnionGroupName;
     private String unionRelationUnitId;
+    private String unionRelationUnitName;
+    private String unionRelationUnionId;
     private String unionRelationUnionName;
     private String unionRelationThreeUnitId;
     private String unionRelationUnionGroupName;

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

@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
 				    </el-col>
 			    </el-row>
 
-			    <template v-if="formData.isManyUnit">
+			    <template v-if="formData.isManyUnit && formData.specialStaffType != 'HMC_RELATION'">
 				    <el-row :gutter="10">
 					    <el-col :span=12>
 						    <el-form-item label="所属单位(工会关系)" prop="unionRelationUnitId">
@@ -178,7 +178,7 @@ layout("/layouts/platform.html"){
 							               :disabled="isView" @change="unionRelationUnionChange"
 							               clearable placeholder="请选择工会关系所属工会" style="width: 100%">
 								    <el-option v-for="item in unionRelationUnionOptions" :key="item.id"
-								               :label="item.unionname" :value="item.id"></el-option>
+								               :label="item.name" :value="item.id"></el-option>
 							    </el-select>
 						    </el-form-item>
 					    </el-col>
@@ -250,7 +250,7 @@ layout("/layouts/platform.html"){
 	    methods: {
 		    unionRelationUnionChange(val){
 			    const unionInfo = this.unionRelationUnionOptions.find(v=> v.id === val)
-			    this.formData.unionRelationUnionName = unionInfo.unionname
+			    this.formData.unionRelationUnionName = unionInfo.name
 		    },
 		    dropdownCommand(command) {
 			    const { type, data } = command
@@ -280,7 +280,6 @@ layout("/layouts/platform.html"){
 			    this.isView = false
 			    this.formData = {}
 			    this.getUserInfo(userId)
-			    // this.$refs.guava.edit()
 			    this.specialStaffDialog = true
 			    this.specialStaffTitle = "修改人员"
 		    },
@@ -288,14 +287,12 @@ layout("/layouts/platform.html"){
 			    this.isView = true
 			    this.formData = {}
 			    this.getUserInfo(userId)
-			    // this.$refs.guava.edit()
 			    this.specialStaffDialog = true
 			    this.specialStaffTitle = "查看人员信息"
 		    },
 		    personnelAdd() {
 			    this.isView = false
 			    this.formData = {}
-			    // this.$refs.guava.edit()
 			    this.specialStaffDialog = true
 			    this.specialStaffTitle = "新增人员"
 		    },
@@ -310,9 +307,6 @@ layout("/layouts/platform.html"){
 			    this.$axios.post(url, { userId: param }).then((resp) => {
 				    if (resp.code === 0) {
 					    this.formData = resp.data
-					    if (resp.data && resp.data.unionRelationThreeUnitId) {
-						    this.getThreeUnits(resp.data.unionRelationUnitId)
-					    }
 					    this.queryUser(this.formData.loginname, false)
 				    }
 			    })
@@ -356,7 +350,6 @@ layout("/layouts/platform.html"){
 									    this.formData = {}
 									    this.specialStaffDialog = false
 									    this.pageData()
-									    // this.$refs.guava.index()
 								    }
 							    })
 				    }