修改bug

commons/src/main/java/com/jzg/commons/entity/vo/SysDeptVo.java

@@ -43,6 +43,9 @@ public class SysDeptVo implements Serializable {
     @Schema(description = "负责人id")
     private String leaderId;
 
+    @Schema(description = "负责人名称")
+    private String leaderName;
+
     @NotBlank(message = "请选择展业范围")
     @Schema(description = "展页范围")
     private List<String> exhibitionScope;

commons/src/main/java/com/jzg/commons/entity/vo/SysUserSelectVo.java

@@ -17,4 +17,7 @@ public class SysUserSelectVo {
 
     @Schema(description = "手机号")
     private String mobile;
+
+    @Schema(description = "用户id")
+    private String userId;
 }

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.entity.dto.SysSystemAddParam;
 import com.jzg.commons.entity.dto.SysSystemEditParam;
@@ -64,6 +65,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @IgnoreTenant
     public boolean updatePerms(SysSystemPermsVo sysSystemPermsVo) {
         // 保存勾选菜单配置
         String permsStr = sysSystemPermsVo.getPermsStr();

tenant/organization/src/main/java/com/jzg/organization/controller/AreaController.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.controller;
 
+import com.jzg.commons.aop.PremissionCheck;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.vo.SysAreaVo;
 import com.jzg.organization.service.SysAreaService;
@@ -23,6 +24,7 @@ public class AreaController {
 
     @Schema(description = "省市区树结构查询")
     @PostMapping(value = "/queryTree")
+    @PremissionCheck
     public HttpResult<List<SysAreaVo>> queryTree() {
         List<SysAreaVo> sysAreaVos = sysAreaService.querySysArea();
         return HttpResult.ok(sysAreaVos);

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -46,12 +46,6 @@ public class DeptController extends BaseController {
     }
 
 
-//    @Operation(summary = "批量设置机构负责人接口", description = "批量设置机构负责人接口")
-//    @PostMapping(value = "/batchLeader")
-//    public HttpResult batchLeader(@RequestBody SysDeptVo sysDeptVo) {
-//        return sysDeptService.batchLeader(sysDeptVo);
-//    }
-
     @Operation(summary = "批量删除机构接口", description = "批量删除机构接口")
     @PostMapping(value = "/batchDeleteDept")
     public HttpResult batchDeleteDept(@RequestBody SysDeptVo sysDeptVo) {

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserMapper.java

@@ -26,6 +26,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     List<String> getUserRoleName(String userId);
-
-
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysDeptService.java

@@ -28,10 +28,6 @@ public interface SysDeptService extends IService<SysDept> {
      */
     HttpResult deleteDept(SysDeptVo sysDeptVo);
 
-    /**
-     * 批量更新机构负责人
-     */
-    HttpResult batchLeader(SysDeptVo sysDeptVo);
 
     /**
      *  批量删除机构

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -114,20 +114,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     }
 
-    @Override
-    @Transactional
-    public HttpResult batchLeader(SysDeptVo sysDeptVo) {
-        // 更新每个部门的负责人
-        for (String id : sysDeptVo.getDeptIds()) {
-            SysDept sysDept = getById(id);
-            if (sysDept == null) {
-                throw new SystemException("机构不存在");
-            }
-            sysDept.setLeaderId(sysDeptVo.getLeaderId());
-            sysDeptMapper.updateById(sysDept);
-        }
-        return HttpResult.ok("批量设置负责人成功。");
-    }
 
     @Override
     @Transactional
@@ -199,6 +185,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             if(areaString.length()>0) {
                 item.setDivision(areaString.substring(0, areaString.length() - 1));
             }
+            if(!Objects.isNull(item.getLeaderId())){
+                SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId());
+                if(!Objects.isNull(userByUserId)){
+                    item.setLeaderName(userByUserId.getName());
+                }
+            }
         });
 
         Map<String, List<SysDeptVo>> map = voDept.stream().collect(Collectors.groupingBy(SysDeptVo::getParentId));

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -21,6 +21,7 @@
     <select id="getUserSelect" resultType="com.jzg.commons.entity.vo.SysUserSelectVo">
         SELECT
         suji.id,
+        su.id as userId,
         suji.name,
         su.mobile
         FROM