解决冲突以及代码变量提高可读性

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

@@ -1,5 +1,6 @@
 package com.jzg.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
@@ -17,6 +18,8 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.SysDeptMapper;
 import com.jzg.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +34,8 @@ import java.util.stream.Collectors;
 @Service
 public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService, HistoryDataService {
 
+    private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);
+
     @Autowired
     private SysDeptMapper sysDeptMapper;
 
@@ -156,6 +161,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     @Override
     public List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param) {
+        log.info("查询机构树： deptId=[{}], param=[{}]", deptId, JSONUtil.toJsonStr(param));
         if(Objects.isNull(deptId)){
             deptId = "";
         }
@@ -166,15 +172,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         }else{
             userSystemCode = sysCode;
         }
-        SysSystem bySysCode = sysSystemService.getBySystemCode(userSystemCode);
+        SysSystem sysSystem = 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("")) {
+        if(!deptId.isEmpty()) {
             lqw.likeRight(SysDept::getRoute, deptId);
         }
-        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, bySysCode.getSysCode());
+        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, sysSystem.getSysCode());
         List<SysDept> sysDeptList = list(lqw);
 
         List<SysDeptVo> voDept = new ArrayList<>();
@@ -197,7 +203,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 item.setDivision(areaString.substring(0, areaString.length() - 1));
             }
             if(!Objects.isNull(item.getLeaderId())){
-                SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId(),bySysCode.getSysCode());
+                SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId(),sysSystem.getSysCode());
                 if(!Objects.isNull(userByUserId)){
                     item.setLeaderName(userByUserId.getName());
                 }

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

@@ -180,7 +180,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     @Override
     public List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param) {
-        log.info("查询部门信息：deptTid=[{}]，param=[{}]",deptId, JSONUtil.toJsonStr(param));
+        log.info("查询部门信息：deptId=[{}]，param=[{}]",deptId, JSONUtil.toJsonStr(param));
         deptId = Objects.toString(deptId, "");
         // 用户所属的部门序号
         final String userDeptId = deptId;