diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 3f1932b8..c34113e8 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -1,33 +1,38 @@ package com.jero.modules.system.service.impl; -import java.util.*; - import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.system.vo.SysDepartTreeModel; -import com.jero.common.util.oConvertUtils; -import org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; +import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.YouBianCodeUtil; -import com.jero.modules.system.entity.*; -import com.jero.modules.system.mapper.*; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysDepartPermission; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.entity.SysUserDepart; +import com.jero.modules.system.mapper.SysDepartMapper; +import com.jero.modules.system.mapper.SysDepartPermissionMapper; +import com.jero.modules.system.mapper.SysUserDepartMapper; +import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.util.FindsDepartsChildrenUtil; +import io.netty.util.internal.StringUtil; +import org.apache.commons.lang3.StringUtils; 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import io.netty.util.internal.StringUtil; +import java.util.*; +import java.util.stream.Collectors; /** *
@@ -236,7 +241,40 @@ public class SysDepartServiceImpl extends ServiceImpl