Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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

@@ -304,7 +304,7 @@ public class SysUserController {
      * @author work@yujt.net.cn
      * @date 2019/11/27 14:31
      */
-    @GetMapping("options/getByLoginUser")
+    @GetMapping("deptOptions/getByLoginUser")
     public Result<DeptOption> getUserDeptOption() {
         return sysDeptService.getUserDeptOption();
     }

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

@@ -454,7 +454,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public Result<DeptOption> getUserDeptOption() {
         Long userId = SecurityUser.getUserId();
-        DeptOption option = (DeptOption) redisUtils.get(RedisKeys.getAdminUserDeptOptionKey(userId));
-        return new Result<DeptOption>().ok(option);
+        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(userId);
+        Object obj = redisUtils.get(deptOptionKey);
+        if (null == obj) {
+            this.packageUserDeptOption(userId);
+            obj = redisUtils.get(deptOptionKey);
+        }
+        return new Result<DeptOption>().ok((DeptOption) obj);
     }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -114,16 +114,12 @@
 
     <select id="selectListHeadDeptNode" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         SELECT
-            d1.id,
-            d1.`name`
+            d1.id, d1.`name`
         FROM
             sys_dept d
             LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' )
         WHERE
-            d.id IN
-            <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" >
-                #{deptId}
-            </foreach>
+            d.id IN <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>
             AND d1.pid = 0
         GROUP BY d1.id
         ORDER BY d1.create_date ASC
@@ -135,8 +131,8 @@
             ( SELECT * FROM sys_dept d1 WHERE d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")" > #{item} </foreach> ) tem1,
             ( SELECT *  FROM sys_dept d2 WHERE d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>) tem2
         WHERE
-            tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' )
-            OR NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID )
+            ( tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' ) OR tem1.PID = tem2.ID )
+            OR ( tem2.ID = tem1.ID AND NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID ) )
             AND tem2.ID != ''
         GROUP BY tem2.ID
         ORDER BY tem2.create_date ASC

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/UserDetailRedis.java

@@ -70,5 +70,6 @@ public class UserDetailRedis {
         //清空菜单导航、权限标识
         redisUtils.deleteByPattern(RedisKeys.getUserMenuNavKey(id));
         redisUtils.delete(RedisKeys.getUserPermissionsKey(id));
+        redisUtils.delete(RedisKeys.getAdminUserDeptOptionKey(id));
     }
 }