Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/resources/application-dev.yml

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://139.9.157.49:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://47.104.91.229:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: dev
-          password: 8AXjjCHZ666!
+          password: zfTFIJjaN#6xB83r
         # 从库数据源
 #        slave:
 #          lazy: true

dsk-common/src/main/java/com/dsk/common/enums/UserType.java

@@ -17,12 +17,12 @@ public enum UserType {
     /**
      * pc端
      */
-    SYS_USER("sys_user"),
+    SYS_USER("00"),
 
     /**
      * app端
      */
-    APP_USER("app_user");
+    APP_USER("01");
 
     private final String userType;
 

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -88,7 +88,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                 List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
                 ids.add(user.getDeptId());
                 w.in("u.dept_id", ids);
-            });
+            }).orderByDesc("u.create_time");
         return wrapper;
     }