Merge branch 'refs/heads/master' into sso

zhsq_qk-common/src/main/java/zhsq_qk/common/core/domain/entity/SysUser.java

@@ -136,8 +136,7 @@ public class SysUser extends BaseEntity {
     }
 
     public static boolean isAdmin(Long userId) {
-//        return userId != null && (1L == userId || 20230316036L == userId);
-        return userId != null && 1L == userId;
+        return userId != null && (1L == userId || 20230316036L == userId);
     }
 
     public Long getUserId() {

zhsq_qk-common/src/main/java/zhsq_qk/common/utils/SecurityUtils.java

@@ -102,8 +102,7 @@ public class SecurityUtils {
      * @return 结果
      */
     public static boolean isAdmin(Long userId) {
-//        return userId != null && (1L == userId || 20230316036L == userId);
-        return userId != null && 1L == userId;
+        return userId != null && (1L == userId || 20230316036L == userId);
     }
 
     /**