1

src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java

@@ -91,7 +91,7 @@ public class ActivityBasicUnitController {
                                 )
                         ));
             }
-            List<Tree<String>> treeList = TreeUtil.build(nodeList, StrUtil.blankToDefault(pid, "J"));
+            List<Tree<String>> treeList = TreeUtil.build(nodeList, StrUtil.blankToDefault(pid, "0"));
             return Result.success(treeList);
         } catch (Exception e) {
             return Result.error();

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java

@@ -102,13 +102,9 @@ public class MemberApplyMineController {
                 """);
         Cnd cnd = Cnd.NEW();
         MemberApplyPageForm.buildSearch(cnd, pageForm);
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
-            if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
-                cnd.and("info.unionId", "=", SecurityUtil.getUnionId());
-            } else {
             cnd.and("info.userId", "=", SecurityUtil.getUserId());
         }
-        }
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.desc("info.applyDateTime");
         } else {

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java

@@ -1,18 +1,23 @@
 package com.budwk.app.zhgh.staffmanage.member.controller.info;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.sys.models.Sys_role;
 import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord;
 import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -67,9 +72,9 @@ public class MemberInfoInputController {
     @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission("member.info.input")
     @SLog(tag = "会员信息录入", type = "add", msg = "新增会员")
-    public Result add(Sys_user user) {
+    public Result add(Sys_user user, String unionId, String unitId) {
         try {
-            memberInfoService.addMember(user);
+            memberInfoService.addMember(user,unionId,unitId);
             return Result.success("新增成功");
         } catch (Exception e) {
             return Result.error(e.getMessage());
@@ -84,6 +89,10 @@ public class MemberInfoInputController {
     public Result doDelete(String id, String userId) {
         try {
             memberInfoService.dao().delete(MemberChangeRecord.class, id);
+            Sys_role memberRole = memberInfoService.dao().fetch(Sys_role.class, Cnd.where("code", "=", RoleConstant.MEMBER.name()));
+            Sys_role publicRole = memberInfoService.dao().fetch(Sys_role.class, Cnd.where("code", "=", RoleConstant.PUBLIC.name()));
+            memberInfoService.dao().execute(Sqls.create("delete from sys_user_role where userId = \'"+userId+"\' and roleId = \'"+publicRole.getId()+"\'"));
+            memberInfoService.dao().execute(Sqls.create("delete from sys_user_role where userId = \'"+userId+"\' and roleId = \'"+memberRole.getId()+"\'"));
             memberInfoService.dao().delete(Sys_user.class, userId);
             return Result.success("删除成功");
         } catch (Exception e) {

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberInfoService.java

@@ -38,7 +38,7 @@ public interface MemberInfoService extends BaseService<Sys_user> {
      * 新增会员
      * @param user 会员信息
      */
-    void addMember(Sys_user user);
+    void addMember(Sys_user user, String unionId, String unitId);
 
     /**
      * 获取会员历史

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.DesensitizedUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
@@ -13,11 +14,8 @@ import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.*;
 import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
-import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.*;
-import com.budwk.app.sys.models.Sys_unit;
-import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
-import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin;
 import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType;
@@ -177,7 +175,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
 
     @Override
     @Aop(TransAop.READ_COMMITTED)
-    public void addMember(Sys_user user) {
+    public void addMember(Sys_user user, String unionId, String unitId) {
         if (StrUtil.isBlank(user.getLoginname())) {
             throw new BaseException("工号不能为空");
         }
@@ -231,10 +229,16 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
         changeRecord.setUserId(user.getId());
         changeRecord.setUsername(user.getUsername());
         changeRecord.setLoginname(user.getLoginname());
-        changeRecord.setUnitId(user.getUnitId());
+        changeRecord.setUnitId(unitId);
-        changeRecord.setUnitName(user.getUnit() != null ? user.getUnit().getName() : "");
+        Sys_unit unit = dao().fetch(Sys_unit.class, Cnd.where("id", "=", unitId));
-        changeRecord.setUnionId(user.getUnion() != null ? user.getUnion().getId() : null);
+        if(ObjectUtil.isNotEmpty(unit)){
-        changeRecord.setUnionName(user.getUnion() != null ? user.getUnion().getName() : "");
+            changeRecord.setUnitName(unit.getName());
+        }
+        changeRecord.setUnionId(unionId);
+        Sys_union union = dao().fetch(Sys_union.class, Cnd.where("id", "=", unionId));
+        if(ObjectUtil.isNotEmpty(union)){
+            changeRecord.setUnionName(union.getName());
+        }
         changeRecord.setSex(user.getSex());
         changeRecord.setBirthday(user.getBirthday());
         changeRecord.setIdCard(user.getIdCard());

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

@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
 	    </el-card>
 
 	    <el-card shadow="never" class="mt10">
-		    <table-tool label="人员列表(工会小组或分工会提交的变更还需校工会审核哦)">
+		    <table-tool label="人员列表(工会小组或分工会提交的变更还需校工会审核)">
 			    <el-button :disabled="!checkUsers.length" @click="openBatchEditMember" class="ml5" icon="el-icon-edit"
 			               size="small" type="primary">
 				    设置会员