部门 部门顺序

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -140,7 +140,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             //筛选公司下所有的部门
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
             List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>()
-                    .eq("company_id", companyId));
+                    .eq("company_id", companyId).orderByDesc("department_id"));
             //结果列表
             List<DepartmentVO> list = new ArrayList<>();
             Stack<DepartmentVO>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -184,8 +184,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public HttpRespMsg getEmployeeList(Integer departmentId, Integer pageIndex, Integer pageSize, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
-//            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
-            Integer companyId = 6;
+            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
             Integer total = 0;
             List<Map<String, Object>> list = new ArrayList<>();
             Page<User> page = new Page<>(pageIndex, pageSize);