diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java index c86f3890..84ce1bae 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java @@ -5,17 +5,15 @@ import cn.odboy.model.system.dto.DeptQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - import java.util.List; import java.util.Set; @Mapper public interface DeptMapper extends BaseMapper { - List findDeptListByPage(@Param("criteria") DeptQueryCriteria criteria); - List findDeptListByPid(@Param("pid") Long pid); + List findDept(@Param("criteria") DeptQueryCriteria criteria); + List findDeptByPid(@Param("pid") Long pid); int countDeptByPid(@Param("pid") Long pid); - List findDeptListByPidIsNull(); - Set findDeptSetByRoleId(@Param("roleId") Long roleId); + List findDeptByPidIsNull(); + Set findDeptByRoleId(@Param("roleId") Long roleId); void updateDeptSubCountById(@Param("count") Integer count, @Param("id") Long id); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java index 7bda7c1e..b0c0f0f2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java @@ -64,7 +64,7 @@ public class DeptServiceImpl extends ServiceImpl implements De } // 数据权限 criteria.setIds(SecurityUtil.getCurrentUserDataScope()); - List list = deptMapper.findDeptListByPage(criteria); + List list = deptMapper.findDept(criteria); // 如果为空,就代表为自定义权限或者本级权限,就需要去重,不理解可以注释掉,看查询结果 if (StringUtil.isBlank(dataScopeType)) { return deduplication(list); @@ -85,12 +85,12 @@ public class DeptServiceImpl extends ServiceImpl implements De @Override public List findByPid(long pid) { - return deptMapper.findDeptListByPid(pid); + return deptMapper.findDeptByPid(pid); } @Override public Set findByRoleId(Long id) { - return deptMapper.findDeptSetByRoleId(id); + return deptMapper.findDeptByRoleId(id); } @Override @@ -150,7 +150,7 @@ public class DeptServiceImpl extends ServiceImpl implements De public Set getDeleteDepts(List menuList, Set deptSet) { for (Dept dept : menuList) { deptSet.add(dept); - List depts = deptMapper.findDeptListByPid(dept.getId()); + List depts = deptMapper.findDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(depts)) { getDeleteDepts(depts, deptSet); } @@ -163,7 +163,7 @@ public class DeptServiceImpl extends ServiceImpl implements De List list = new ArrayList<>(); deptList.forEach(dept -> { if (dept != null && dept.getEnabled()) { - List depts = deptMapper.findDeptListByPid(dept.getId()); + List depts = deptMapper.findDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(depts)) { list.addAll(getDeptChildren(depts)); } @@ -177,10 +177,10 @@ public class DeptServiceImpl extends ServiceImpl implements De @Override public List getSuperior(Dept dept, List depts) { if (dept.getPid() == null) { - depts.addAll(deptMapper.findDeptListByPidIsNull()); + depts.addAll(deptMapper.findDeptByPidIsNull()); return depts; } - depts.addAll(deptMapper.findDeptListByPid(dept.getPid())); + depts.addAll(deptMapper.findDeptByPid(dept.getPid())); return getSuperior(findById(dept.getPid()), depts); } diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml index a1a5ee32..20368e7b 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml @@ -17,7 +17,7 @@ update sys_dept set sub_count = #{count} where dept_id = #{id} - SELECT dept_id, `name`, @@ -57,21 +57,21 @@ ORDER BY dept_sort - select dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort from sys_dept where pid = #{pid} - select dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort from sys_dept where pid is null - SELECT d.dept_id AS id, d.NAME,