同步最新代码

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -347,11 +347,11 @@ public class SysUserController {
         DeptOption deptOption = sysDeptService.getDeptAuthByUser();
         return new Result().ok(deptOption);
     }
-//    @GetMapping("deptOptions/getGridAuthByUser")
-//    public Result<List<DeptGridDTO>> getGridAuthByUser() {
-//        List<DeptGridDTO> deptOption = sysDeptService.getGridAuthByUser();
-//        return new Result().ok(deptOption);
-//    }
+    @GetMapping("deptOptions/getGridAuthByUser")
+    public Result<List<DeptGridDTO>> getGridAuthByUser() {
+        List<DeptGridDTO> deptOption = sysDeptService.getGridAuthByUser();
+        return new Result().ok(deptOption);
+    }
 
     /**
      * 获取用户部门多层结构（完整层级结构，包括顶级部门），用户前端显示，请求需携带token

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -128,7 +128,7 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<SysDeptEntity> selectChildrenDeptNode(@Param("dataScopeDeptList") List<Long> dataScopeDeptList, @Param("parentDeptIdList") List<Long> parentDeptIdList);
 
     List<SysDeptEntity> selectChildrenDeptAuth(@Param("dataScopeDeptList") List<Long> dataScopeDeptList);
-//    List<DeptGridDTO> getGridAuthByUser(@Param("deptList") List<Long> deptList);
+    List<DeptGridDTO> getGridAuthByUser(@Param("deptList") List<Long> deptList);
 
     /**
      * @param formDTO

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -165,7 +165,7 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
 
     DeptOption getDeptAuthByUser();
 
-//    List<DeptGridDTO> getGridAuthByUser();
+    List<DeptGridDTO> getGridAuthByUser();
 
     /**
      * @param formDTO

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -354,18 +354,18 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public DeptOption getDeptAuthByUser() {
         return getDeptAuthByUser(SecurityUser.getUserId());
     }
-//    @Override
-//    public List<DeptGridDTO> getGridAuthByUser() {
-//        // 用户拥有的所有部门权限
-//        List<Long> deptList = SecurityUser.getUser().getDeptIdList();
-//        List<DeptGridDTO> list;
-//        if (deptList != null && deptList.size() > 0) {
-//            list = baseDao.getGridAuthByUser(deptList);
-//        } else {
-//            return null;
-//        }
-//        return list;
-//    }
+    @Override
+    public List<DeptGridDTO> getGridAuthByUser() {
+        // 用户拥有的所有部门权限
+        List<Long> deptList = SecurityUser.getUser().getDeptIdList();
+        List<DeptGridDTO> list;
+        if (deptList != null && deptList.size() > 0) {
+            list = baseDao.getGridAuthByUser(deptList);
+        } else {
+            return null;
+        }
+        return list;
+    }
 
 
     /**
@@ -461,10 +461,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public DeptOption getStreetByLoginUser() {
         DeptOption result = getUserDeptOption(SecurityUser.getUserId());
-        List<JSONObject> options = result.getOptions();
-        if (options.isEmpty()) {
+        if (null == result || result.getOptions().isEmpty()) {
             return result;
         }
+        List<JSONObject> options = result.getOptions();
         // 代表存在子级机构的json key
         String childJsonOptionKey = "children";
         // 一个街道机构
@@ -1052,9 +1052,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         if (formDTO.getDeptIdList() != null && formDTO.getDeptIdList().size() >0) {
             map.put("deptId", formDTO.getDeptIdList().get(0));
         }
-//        if (formDTO.getDeptName() != null && formDTO.getDeptName() != "") {
-//            map.put("deptName", formDTO.getDeptName());
-//        }
+        if (formDTO.getDeptName() != null && formDTO.getDeptName() != "") {
+            map.put("deptName", formDTO.getDeptName());
+        }
         List<UserSysDeptInfoResultDTO> list = baseDao.selectListAllDeptInfo(map); // 获取全部的部门信息
         return list;
     }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a
+Subproject commit 932fc9b1dda6f04cbe076fabad5738a200709d54