平台租户机构bug修复

gateway/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/sysDept/**
 
         - id: tenant_route
           uri: http://localhost:8084/

platform/src/main/java/com/jzg/controller/SysDeptController.java

@@ -0,0 +1,77 @@
+package com.jzg.controller;
+
+
+import com.jzg.commons.annotation.IgnoreTenant;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysDeptParam;
+import com.jzg.commons.entity.po.SysDept;
+import com.jzg.commons.entity.vo.DeptLeaderVo;
+import com.jzg.commons.entity.vo.SysDeptVo;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.service.SysDeptService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name="租户机构管理（平台系统）")
+@RestController
+@RequestMapping("/sysDept")
+public class SysDeptController extends BaseController {
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    @Operation(summary = "新增机构接口", description = "新增机构接口")
+    @PostMapping(value = "/add")
+    public HttpResult<Boolean> addDept(@RequestBody SysDeptVo sysDeptVo) {
+        return sysDeptService.addDept(sysDeptVo) ? HttpResult.ok("添加机构成功") : HttpResult.error("添加机构失败");
+    }
+
+    @Operation(summary = "修改机构接口", description = "修改机构接口")
+    @PostMapping(value = "/update")
+    public HttpResult updateDept(@RequestBody SysDeptVo sysDeptVo) {
+        SysDept byId = sysDeptService.getById(sysDeptVo.getId());
+        return sysDeptService.updateDept(sysDeptVo) ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
+    }
+
+    @Operation(summary = "删除机构接口", description = "删除机构接口")
+    @PostMapping(value = "/delete")
+    public HttpResult deleteDept(@RequestBody SysDeptVo sysDeptVo) {
+        return sysDeptService.deleteDept(sysDeptVo);
+    }
+
+
+    @Operation(summary = "批量删除机构接口", description = "批量删除机构接口")
+    @PostMapping(value = "/batchDeleteDept")
+    public HttpResult batchDeleteDept(@RequestBody SysDeptVo sysDeptVo) {
+        return sysDeptService.batchDeleteDept(sysDeptVo);
+    }
+
+    @Operation(summary = "机构树形查询")
+    @PostMapping(value = "/getDeptTree")
+    public HttpResult<List<SysDeptVo>> getDeptTree(@RequestBody SysDeptParam param){
+        String deptId = "";
+        if(StringUtils.isEmpty(param.getSysCode())){
+            deptId = getUserDeptId();
+        }
+        List<SysDeptVo> deptTree = sysDeptService.getDeptTree(deptId,param);
+        return HttpResult.ok(deptTree);
+    }
+
+
+    /**
+     * 机构信息查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = { "/deptGet"})
+    @Operation(summary = "机构信息查询")
+    public HttpResult deptGet(String id) {
+        return HttpResult.ok(sysDeptService.queryById(id));
+    }
+
+}

platform/src/main/java/com/jzg/mapper/SysDeptMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jzg.commons.entity.po.SysDept;
+import com.jzg.commons.entity.vo.SysDeptVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,4 +12,19 @@ import java.util.List;
 
 @Mapper
 public interface SysDeptMapper extends BaseMapper<SysDept> {
+
+    /**
+     * 查询机构管理数据
+     * @param queryWrapper
+     * @return
+     */
+    List<SysDept> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
+
+    /**
+     * 获取机构信息
+     * @param deptId
+     * @param sysCode
+     * @return
+     */
+    List<SysDeptVo> selectDeptVoList(@Param("deptId")String deptId,@Param("sysCode")String sysCode);
 }

platform/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -8,6 +8,8 @@ import com.jzg.commons.entity.vo.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author dongxin
 * @description 针对表【sys_user(核心用户表)】的数据库操作Mapper
@@ -24,6 +26,13 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     Page<SysUserVo> queryPage(Page page, @Param("param") SysUserParam param);
+
+    /**
+     * 获取用户信息
+     * @param sysUserVo
+     * @return
+     */
+    List<SysUserVo> getUserInfo(@Param("param") SysUserVo sysUserVo);
 }
 
 

platform/src/main/java/com/jzg/service/SysDeptService.java

@@ -0,0 +1,45 @@
+package com.jzg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysDeptParam;
+import com.jzg.commons.entity.po.SysDept;
+import com.jzg.commons.entity.vo.SysDeptVo;
+
+import java.util.List;
+
+public interface SysDeptService extends IService<SysDept> {
+
+    /**
+     * 新增机构
+     */
+    boolean addDept(SysDeptVo sysDeptVo);
+
+    /**
+     * 更新机构
+     */
+    boolean updateDept(SysDeptVo sysDeptVo);
+
+    /**
+     * 删除机构
+     */
+    HttpResult deleteDept(SysDeptVo sysDeptVo);
+
+
+    /**
+     *  批量删除机构
+     */
+    HttpResult batchDeleteDept(SysDeptVo sysDeptVo);
+
+    /**
+     * 机构树
+     */
+    List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param);
+
+    /**
+     * 根据id获取机构信息
+     * @param id
+     * @return
+     */
+    SysDeptVo queryById(String id);
+}

platform/src/main/java/com/jzg/service/SysUserJzgInfoService.java

@@ -0,0 +1,14 @@
+package com.jzg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+
+public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
+
+    /**
+     * 通过userId查询用户信息
+     * @param userId
+     * @return
+     */
+    SysUserJzgInfo getUserByUserId(String userId);
+}

platform/src/main/java/com/jzg/service/SysUserService.java

@@ -97,4 +97,11 @@ public interface SysUserService extends IService<SysUser> {
      * @return
      */
     Boolean userDeleteValid(List<String> ids);
+
+    /**
+     * 获取人员信息
+     * @param sysUserVo
+     * @return
+     */
+    List<SysUserVo> getUserInfo(SysUserVo sysUserVo);
 }

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

@@ -0,0 +1,228 @@
+package com.jzg.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysDeptParam;
+import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.vo.ChangeDeptVo;
+import com.jzg.commons.entity.vo.DeptLeaderVo;
+import com.jzg.commons.entity.vo.SysDeptVo;
+import com.jzg.commons.entity.vo.SysUserVo;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
+import com.jzg.mapper.SysDeptMapper;
+import com.jzg.service.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private SysSystemService sysSystemService;
+
+    @Autowired
+    private BaseController baseController;
+
+    @Autowired
+    private SysUserService userService;
+
+    @Autowired
+    private SysAreaBService sysAreaService;
+
+    @Autowired
+    private SysUserJzgInfoService sysUserJzgInfoService;
+
+    private void validateDept(SysDeptVo sysDeptVo, boolean isAdd){
+        if(isAdd){
+            if(this.count(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getName, sysDeptVo.getName())) > 0){
+                throw new SystemException("机构名称已存在");
+            }
+        }else{
+            if(this.count(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getName, sysDeptVo.getName())
+                    .ne(SysDept::getId, sysDeptVo.getId())) > 0){
+                throw new SystemException("机构名称已存在");
+            }
+        }
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addDept(SysDeptVo sysDeptVo) {
+        validateDept(sysDeptVo,true);
+
+        SysDept sysDept = new SysDept();
+        BeanUtils.copyProperties(sysDeptVo, sysDept);
+        sysDept.setId(IdGenerate.nextId());
+        //处理展业信息
+        sysDept.setExScope(sysDeptVo);
+        //获取父级id
+        String parentId = sysDept.getParentId();
+        //设置机构路径
+        if(!parentId.equals("0")){
+            SysDept parentSysDept = baseMapper.selectById(parentId);
+            if(!Objects.isNull(parentSysDept)){
+                sysDept.setRoute(parentSysDept.getRoute() + "-" + sysDept.getId());
+            }
+        }else{
+            sysDept.setRoute(sysDept.getId());
+        }
+        if (StringUtils.isNotEmpty(sysDeptVo.getSystemCode())){
+            sysDept.setSystemCode(sysDeptVo.getSystemCode());
+        }
+        if (Objects.isNull(sysDept.getLeaderId()) || sysDept.getLeaderId().isEmpty()){
+            sysDept.setLeaderId(null);
+        }
+        return this.save(sysDept);
+    }
+
+    public SysDept getSysDept(SysDeptVo sysDeptVo){
+        SysDept sysDept = new SysDept();
+        sysDept.setId(sysDeptVo.getId());
+        sysDept.setName(sysDeptVo.getName());
+        sysDept.setParentId(sysDeptVo.getParentId());
+        sysDept.setOrderNum(sysDeptVo.getOrderNum());
+        sysDept.setComType(sysDeptVo.getComType());
+        sysDept.setRoute(sysDeptVo.getRoute());
+        sysDept.setAddress(sysDeptVo.getAddress());
+        sysDept.setLeaderId(sysDeptVo.getLeaderId());
+        sysDept.setProvince(sysDeptVo.getProvince());
+        sysDept.setCity(sysDeptVo.getCity());
+        sysDept.setArea(sysDeptVo.getArea());
+        sysDept.setExScope(sysDeptVo);
+        return sysDept;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateDept(SysDeptVo sysDeptVo) {
+        validateDept(sysDeptVo,false);
+        sysDeptMapper.updateById(getSysDept(sysDeptVo));
+        return true;
+
+    }
+
+
+    @Override
+    @Transactional
+    public HttpResult deleteDept(SysDeptVo sysDeptVo) {
+        SysDept sysDept = getById(sysDeptVo.getId());
+        if (sysDept == null) {
+            throw new SystemException("机构不存在");
+        }
+        List<SysDept> deptList = lambdaQuery().eq(SysDept::getParentId, sysDept.getId()).list();
+        if (!deptList.isEmpty()) {
+            throw new SystemException(sysDept.getName() + "机构下还有其他隶属机构请将这些子机构删除后，再进行删除");
+        }
+        SysUserVo vo = new SysUserVo();
+        vo.setDeptId(sysDept.getId());
+        List<SysUserVo> userInfo = userService.getUserInfo(vo);
+        if (userInfo.stream().count() > 0) {
+            throw new SystemException(sysDept.getName() + "机构下还有其他用户请将这些用户删除后，再进行删除");
+        }
+        sysDeptMapper.deleteById(sysDeptVo.getId());
+        return HttpResult.ok("删除机构成功");
+    }
+
+    @Override
+    @Transactional
+    public HttpResult batchDeleteDept(SysDeptVo sysDeptVo) {
+        sysDeptVo.getDeptIds().forEach(id->{
+            SysDeptVo vo = new SysDeptVo();
+            vo.setId(id);
+            this.deleteDept(vo);
+        });
+        return HttpResult.ok("批量删除机构成功");
+    }
+
+    @Override
+    public List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param) {
+        if(Objects.isNull(deptId)){
+            deptId = "";
+        }
+        String sysCode = param.getSysCode();
+        String userSystemCode = null;
+        if (StringUtils.isEmpty(sysCode)){
+            userSystemCode = baseController.getUserSystemCode();
+        }else{
+            userSystemCode = sysCode;
+        }
+        SysSystem bySysCode = sysSystemService.getBySystemCode(userSystemCode);
+        List<SysDeptVo> sysDepts = new ArrayList<>();
+        SysDept sysDept = getById(deptId);
+        SysDeptVo sysDeptVo = new SysDeptVo(sysDept);
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+        if(!deptId.equals("")) {
+            lqw.likeRight(SysDept::getRoute, deptId);
+        }
+        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, sysCode);
+        List<SysDept> sysDeptList = list(lqw);
+
+        List<SysDeptVo> voDept = new ArrayList<>();
+        sysDeptList.forEach(item->{
+            SysDeptVo sysDeptv = new SysDeptVo(item);
+            voDept.add(sysDeptv);
+        });
+
+        voDept.forEach(item->{
+            List<String> areas = new ArrayList<>();
+            areas.add(item.getProvince());
+            areas.add(item.getCity());
+            areas.add(item.getArea());
+            List<SysArea> sysAreaVos = sysAreaService.queryAllByAreaCode(areas);
+            String areaString = "";
+            for(int i=0;i<sysAreaVos.size();i++){
+                areaString = areaString + sysAreaVos.get(i).getAreaCname() + "-";
+            }
+            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));
+        voDept.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
+        if(!Objects.isNull(sysDept)) {
+            sysDepts = map.get(sysDeptVo.getParentId());
+        }else{
+            sysDepts = map.get("0");
+        }
+        List<SysDeptVo> newResultDept = new ArrayList<>();
+        SysDeptVo baseDept = new SysDeptVo(sysDept);
+        baseDept.setId("0");
+        baseDept.setName(bySysCode.getSysName());
+        baseDept.setChildren(sysDepts);
+        newResultDept.add(baseDept);
+        return newResultDept;
+    }
+
+    @Override
+    public SysDeptVo queryById(String id) {
+        SysDept sysDept = getById(id);
+        SysDeptVo sysDeptVo = new SysDeptVo(sysDept);
+        return sysDeptVo;
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package com.jzg.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.mapper.SysUserJzgInfoMapper;
+import com.jzg.service.SysUserJzgInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper, SysUserJzgInfo> implements SysUserJzgInfoService {
+
+    @Override
+    public SysUserJzgInfo getUserByUserId(String userId) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                .eq(SysUserJzgInfo::getUserId, userId));
+    }
+}

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

@@ -264,6 +264,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         }
         return true;
     }
+
+    @Override
+    public List<SysUserVo> getUserInfo(SysUserVo sysUserVo) {
+        return baseMapper.getUserInfo(sysUserVo);
+    }
 }
 
 

platform/src/main/resources/application.yml

@@ -42,6 +42,7 @@ tenant:
     - sys_user_jzg_info
     - sys_system
     - sys_area
+    - sys_dept
     - sys_role_perms
     - sys_user_role
     - sys_upload_files

platform/src/main/resources/mapper/SysDeptMapper.xml

@@ -1,5 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jzg.organization.mapper.SysDeptMapper">
+<mapper namespace="com.jzg.mapper.SysDeptMapper">
 
+
+    <select id="selectDeptList" resultType="com.jzg.commons.entity.po.SysDept">
+        select
+        <if test="ew.getSqlSelect != null">
+            ${ew.getSqlSelect}
+        </if>
+        <if test="ew.getSqlSelect == null">
+            *
+        </if>
+        from sys_dept ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectDeptVoList" resultType="com.jzg.commons.entity.vo.SysDeptVo">
+        SELECT
+        sd.*,
+        COALESCE(COUNT(suji.user_id), 0) AS user_count
+        FROM
+        sys_dept sd
+        LEFT JOIN
+        sys_user_jzg_info suji ON suji.dept_id = sd.id
+        where
+        1=1
+        <if test="deptId!=null and deptId!=''">
+
+            route like CONCAT(#{deptId}, '%')
+        </if>
+        <if test="sysCode!=null and sysCode!=''">
+            and sd.system_code = #{sysCode}
+        </if>
+
+        GROUP BY
+        sd.id
+        ORDER BY
+        user_count DESC;
+    </select>
 </mapper>

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -43,4 +43,20 @@
         </where>
         ORDER BY create_time DESC
     </select>
+
+    <select id="getUserInfo" resultType="com.jzg.commons.entity.vo.SysUserVo">
+        SELECT
+        *
+        FROM
+        sys_user su
+        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
+        WHERE
+        1=1
+        <if test="param.id != null and param.id != ''">
+            AND su.id = #{param.id}
+        </if>
+        <if test="param.deptId != null and param.deptId != ''">
+            AND suji.dept_id = #{param.deptId}
+        </if>
+    </select>
 </mapper>

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

@@ -1,21 +1,16 @@
 package com.jzg.organization.controller;
 
-import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysDeptParam;
 import com.jzg.commons.entity.po.SysDept;
-import com.jzg.commons.entity.vo.ChangeDeptVo;
 import com.jzg.commons.entity.vo.DeptLeaderVo;
-import com.jzg.commons.entity.vo.SysAreaVo;
 import com.jzg.commons.entity.vo.SysDeptVo;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.organization.service.SysAreaService;
 import com.jzg.organization.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -70,31 +65,6 @@ public class DeptController extends BaseController {
         return HttpResult.ok(deptTree);
     }
 
-
-    @IgnoreTenant
-    @Operation(summary = "机构树形查询")
-    @PostMapping(value = "/getDeptTreePlatform")
-    public HttpResult<List<SysDeptVo>> getDeptTreePlatform(@RequestBody SysDeptParam param){
-        String deptId = "";
-        if(StringUtils.isEmpty(param.getSysCode())){
-            deptId = getUserDeptId();
-        }
-        List<SysDeptVo> deptTree = sysDeptService.getDeptTreePlatform(deptId,param);
-        return HttpResult.ok(deptTree);
-    }
-
-    /**
-     * 机构信息查询
-     * @param id
-     * @return
-     */
-    @IgnoreTenant
-    @GetMapping(value = { "/deptGetPlatform"})
-    @Operation(summary = "平台机构信息查询")
-    public HttpResult deptGetPlatform(String id) {
-        return HttpResult.ok(sysDeptService.queryById(id));
-    }
-
     /**
      * 机构信息查询
      * @param id

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

@@ -38,7 +38,6 @@ public interface SysDeptService extends IService<SysDept> {
      * 机构树
      */
     List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param);
-    List<SysDeptVo> getDeptTreePlatform(String deptId, SysDeptParam param);
 
     /**
      * 设置机构负责人

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

@@ -216,74 +216,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
 
-    @Override
-    public List<SysDeptVo> getDeptTreePlatform(String deptId, SysDeptParam param) {
-        if(Objects.isNull(deptId)){
-            deptId = "";
-        }
-        String sysCode = param.getSysCode();
-        String userSystemCode = null;
-        if (StringUtils.isEmpty(sysCode)){
-            userSystemCode = baseController.getUserSystemCode();
-        }else{
-            userSystemCode = sysCode;
-        }
-        SysSystem bySysCode = sysSystemService.getBySysCode(userSystemCode);
-        List<SysDeptVo> sysDepts = new ArrayList<>();
-        SysDept sysDept = getById(deptId);
-        SysDeptVo sysDeptVo = new SysDeptVo(sysDept);
-        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
-        if(!deptId.equals("")) {
-            lqw.likeRight(SysDept::getRoute, deptId);
-        }
-        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, sysCode);
-        List<SysDept> sysDeptList = list(lqw);
-
-        List<SysDeptVo> voDept = new ArrayList<>();
-        sysDeptList.forEach(item->{
-            SysDeptVo sysDeptv = new SysDeptVo(item);
-            voDept.add(sysDeptv);
-        });
-
-        voDept.forEach(item->{
-            List<String> areas = new ArrayList<>();
-            areas.add(item.getProvince());
-            areas.add(item.getCity());
-            areas.add(item.getArea());
-            List<SysArea> sysAreaVos = sysAreaService.queryAllByAreaCode(areas);
-            String areaString = "";
-            for(int i=0;i<sysAreaVos.size();i++){
-                areaString = areaString + sysAreaVos.get(i).getAreaCname() + "-";
-            }
-            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));
-        voDept.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
-        if(!Objects.isNull(sysDept)) {
-            sysDepts = map.get(sysDeptVo.getParentId());
-        }else{
-            sysDepts = map.get("0");
-        }
-        List<SysDeptVo> newResultDept = new ArrayList<>();
-        SysDeptVo baseDept = new SysDeptVo(sysDept);
-        baseDept.setId("0");
-        baseDept.setName(bySysCode.getSysName());
-        baseDept.setChildren(sysDepts);
-        newResultDept.add(baseDept);
-        return newResultDept;
-    }
-
-
-
     @Override
     public boolean setDeptLeader(DeptLeaderVo deptLeaderVo) {
         List<SysDept> depts = this.list(new LambdaQueryWrapper<SysDept>()