Bladeren bron

新建部门时,部门领导名字去除空格

zhaoxian 4 jaren geleden
bovenliggende
commit
57d018444e

+ 22 - 6
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysDepartServiceImpl.java

@@ -1,7 +1,16 @@
 package cn.com.ctop.common.module.service.impl;
 
-import cn.com.ctop.common.module.entity.*;
-import cn.com.ctop.common.module.mapper.*;
+import cn.com.ctop.common.module.entity.SysDepart;
+import cn.com.ctop.common.module.entity.SysDepartPermission;
+import cn.com.ctop.common.module.entity.SysDepartRole;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
+import cn.com.ctop.common.module.entity.SysDepartRoleUser;
+import cn.com.ctop.common.module.entity.SysUserDepart;
+import cn.com.ctop.common.module.mapper.SysDepartMapper;
+import cn.com.ctop.common.module.mapper.SysDepartPermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartRolePermissionMapper;
+import cn.com.ctop.common.module.mapper.SysDepartRoleUserMapper;
+import cn.com.ctop.common.module.mapper.SysUserDepartMapper;
 import cn.com.ctop.common.module.model.DepartIdModel;
 import cn.com.ctop.common.module.model.SysDepartTreeModel;
 import cn.com.ctop.common.module.service.ISysBaseApi;
@@ -13,16 +22,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.netty.util.internal.StringUtil;
-import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * <p>
@@ -101,7 +114,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         return listResult;
     }
 
-  //  @Cacheable(value = CacheConstant.SYS_DEPART_IDS_CACHE)
+    //  @Cacheable(value = CacheConstant.SYS_DEPART_IDS_CACHE)
     @Override
     public List<DepartIdModel> queryDepartIdTreeList() {
         LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
@@ -132,6 +145,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
             }
             String s = UUID.randomUUID().toString().replace("-", "");
             sysDepart.setId(s);
+            if (!Check.isNull(sysDepart.getLeaderName())) {
+                sysDepart.setLeaderName(sysDepart.getLeaderName().trim());
+            }
             // 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
             // 获取父级ID
             String parentId = sysDepart.getParentId();