fix Long to String

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -47,19 +47,11 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) String deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
-            SysDept d = (SysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
-                it.remove();
-            }
-        }
+        depts.removeIf(d -> d.getDeptId().equals(deptId)
+            || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
         return AjaxResult.success(depts);
     }
 
@@ -68,7 +60,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    public AjaxResult getInfo(@PathVariable String deptId)
     {
         deptService.checkDeptDataScope(deptId);
         return AjaxResult.success(deptService.selectDeptById(deptId));
@@ -88,7 +80,7 @@ public class SysDeptController extends BaseController
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") String roleId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
 		Map<String,Object> ajax = new HashMap<>();
@@ -144,7 +136,7 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    public AjaxResult remove(@PathVariable String deptId)
     {
         if (deptService.hasChildByDeptId(deptId))
         {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -82,7 +82,7 @@ public class SysLoginController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+        String userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -45,7 +45,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    public AjaxResult getInfo(@PathVariable String menuId)
     {
         return AjaxResult.success(menuService.selectMenuById(menuId));
     }
@@ -64,7 +64,7 @@ public class SysMenuController extends BaseController
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") String roleId)
     {
 		List<SysMenu> menus = menuService.selectMenuList(getUserId());
 		Map<String,Object> ajax = new HashMap<>();
@@ -123,7 +123,7 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    public AjaxResult remove(@PathVariable("menuId") String menuId)
     {
         if (menuService.hasChildByMenuId(menuId))
         {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -66,7 +66,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    public AjaxResult getInfo(@PathVariable String roleId)
     {
         roleService.checkRoleDataScope(roleId);
         return AjaxResult.success(roleService.selectRoleById(roleId));
@@ -158,7 +158,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    public AjaxResult remove(@PathVariable String[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
@@ -210,7 +210,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult cancelAuthUserAll(String roleId, String[] userIds)
     {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
@@ -221,7 +221,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult selectAuthUserAll(String roleId, String[] userIds)
     {
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -102,7 +102,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId)
     {
 		userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
@@ -174,7 +174,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult remove(@PathVariable String[] userIds)
     {
         if (ArrayUtil.contains(userIds, getUserId()))
         {
@@ -215,7 +215,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    public AjaxResult authRole(@PathVariable("userId") String userId)
     {
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
@@ -231,7 +231,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    public AjaxResult insertAuthRole(String userId, String[] roleIds)
     {
         userService.insertUserAuth(userId, roleIds);
         return success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysGatewayUserTask.java

@@ -119,13 +119,13 @@ public class SysGatewayUserTask {
                     SysDept qdept = new SysDept();
                     qdept.setOtherId(gatewayOrg.getOrgId());
                     //为0 的作为组织
-                    qdept.setParentId(0L);
+                    qdept.setParentId("0");
                     List<SysDept> deptList = deptService.selectDeptList(qdept);
                     if(deptList.isEmpty()){
                         //插入
                         SysDept dept = deptList.get(0);
                         dept.setOtherId(gatewayOrg.getOrgId());
-                        dept.setParentId(0L);
+                        dept.setParentId("0");
                         dept.setDeptName(gatewayOrg.getOrgName());
                         dept.setCreateBy("kafka");
                         dept.setCreateTime(new Date());
@@ -138,7 +138,7 @@ public class SysGatewayUserTask {
                         //跟新
                         SysDept dept = deptList.get(0);
                         dept.setOtherId(gatewayOrg.getOrgId());
-                        dept.setParentId(0L);
+                        dept.setParentId("0");
                         dept.setDeptName(gatewayOrg.getOrgName());
                         dept.setUpdateBy("kafka");
                         dept.setUpdateTime(new Date());
@@ -170,7 +170,7 @@ public class SysGatewayUserTask {
                     {
                         SysDept qdept1 = new SysDept();
                         if(gatewayDept.getParentId()==null||gatewayDept.getParentId().equals("")){
-                            qdept1.setParentId(0L);
+                            qdept1.setParentId("0");
                             qdept1.setOtherId(gatewayDept.getOrgId());
                         }else{
                             qdept1.setOtherId(gatewayDept.getParentId());
@@ -198,7 +198,7 @@ public class SysGatewayUserTask {
                     {
                         SysDept qdept1 = new SysDept();
                         if(gatewayDept.getParentId()==null||gatewayDept.getParentId().equals("")){
-                            qdept1.setParentId(0L);
+                            qdept1.setParentId("0");
                             qdept1.setOtherId(gatewayDept.getOrgId());
                         }else{
                             qdept1.setOtherId(gatewayDept.getParentId());

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -99,7 +99,7 @@ public class BaseController
     /**
      * 获取登录用户id
      */
-    public Long getUserId()
+    public String getUserId()
     {
         return getLoginUser().getUserId();
     }
@@ -107,7 +107,7 @@ public class BaseController
     /**
      * 获取登录部门id
      */
-    public Long getDeptId()
+    public String getDeptId()
     {
         return getLoginUser().getDeptId();
     }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java

@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 
 /**
  * Treeselect树结构实体类
- * 
+ *
  * @author ruoyi
  */
 
@@ -24,7 +24,7 @@ public class TreeSelect implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
-    private Long id;
+    private String id;
 
     /** 节点名称 */
     private String label;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -27,13 +27,13 @@ public class SysDept implements Serializable {
 	/**
 	 * 部门ID
 	 */
-	@TableId(value = "dept_id", type = IdType.AUTO)
-	private Long deptId;
+	@TableId(value = "dept_id", type = IdType.ASSIGN_ID)
+	private String deptId;
 
 	/**
 	 * 父部门ID
 	 */
-	private Long parentId;
+	private String parentId;
 
 	/**
 	 * 祖级列表

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -27,8 +27,8 @@ public class SysMenu implements Serializable {
 	/**
 	 * 菜单ID
 	 */
-	@TableId(value = "menu_id", type = IdType.AUTO)
-	private Long menuId;
+	@TableId(value = "menu_id", type = IdType.ASSIGN_ID)
+	private String menuId;
 
 	/**
 	 * 菜单名称

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -34,8 +34,8 @@ public class SysRole implements Serializable {
 	 * 角色ID
 	 */
 	@ExcelProperty(value = "角色序号")
-	@TableId(value = "role_id", type = IdType.AUTO)
-	private Long roleId;
+	@TableId(value = "role_id", type = IdType.ASSIGN_ID)
+	private String roleId;
 
 	/**
 	 * 角色名称
@@ -135,15 +135,15 @@ public class SysRole implements Serializable {
 	 * 菜单组
 	 */
 	@TableField(exist = false)
-	private Long[] menuIds;
+	private String[] menuIds;
 
 	/**
 	 * 部门组（数据权限）
 	 */
 	@TableField(exist = false)
-	private Long[] deptIds;
+	private String[] deptIds;
 
-	public SysRole(Long roleId) {
+	public SysRole(String roleId) {
 		this.roleId = roleId;
 	}
 
@@ -151,8 +151,8 @@ public class SysRole implements Serializable {
 		return isAdmin(this.roleId);
 	}
 
-	public static boolean isAdmin(Long roleId) {
-		return roleId != null && 1L == roleId;
+	public static boolean isAdmin(String roleId) {
+		return "1".equals(roleId);
 	}
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -32,13 +32,13 @@ public class SysUser implements Serializable {
 	/**
 	 * 用户ID
 	 */
-	@TableId(value = "user_id", type = IdType.AUTO)
-	private Long userId;
+	@TableId(value = "user_id", type = IdType.ASSIGN_ID)
+	private String userId;
 
 	/**
 	 * 部门ID
 	 */
-	private Long deptId;
+	private String deptId;
 
 	/**
 	 * 用户账号
@@ -168,7 +168,7 @@ public class SysUser implements Serializable {
 	 * 角色组
 	 */
 	@TableField(exist = false)
-	private Long[] roleIds;
+	private String[] roleIds;
 
 	/**
 	 * 岗位组
@@ -182,9 +182,9 @@ public class SysUser implements Serializable {
 	 * 角色ID
 	 */
 	@TableField(exist = false)
-	private Long roleId;
+	private String roleId;
 
-	public SysUser(Long userId) {
+	public SysUser(String userId) {
 		this.userId = userId;
 	}
 
@@ -192,8 +192,8 @@ public class SysUser implements Serializable {
 		return isAdmin(this.userId);
 	}
 
-	public static boolean isAdmin(Long userId) {
-		return userId != null && 1L == userId;
+	public static boolean isAdmin(String userId) {
+		return "1".equals(userId);
 	}
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -26,12 +26,12 @@ public class LoginUser implements UserDetails
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 部门ID
      */
-    private Long deptId;
+    private String deptId;
 
     /**
      * 用户唯一标识
@@ -84,7 +84,7 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    public LoginUser(String userId, String deptId, SysUser user, Set<String> permissions)
     {
         this.userId = userId;
         this.deptId = deptId;

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -17,7 +17,7 @@ public class SecurityUtils
     /**
      * 用户ID
      **/
-    public static Long getUserId()
+    public static String getUserId()
     {
         try
         {
@@ -32,7 +32,7 @@ public class SecurityUtils
     /**
      * 获取部门ID
      **/
-    public static Long getDeptId()
+    public static String getDeptId()
     {
         try
         {
@@ -113,8 +113,8 @@ public class SecurityUtils
      * @param userId 用户ID
      * @return 结果
      */
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(String userId)
     {
-        return userId != null && 1L == userId;
+        return "1".equals(userId);
     }
 }

ruoyi-framework/pom.xml

@@ -92,6 +92,12 @@
             <version>${alicloud.version}</version>
         </dependency>
 
+        <!-- SpringBoot Websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -19,11 +19,11 @@ public class SysRoleDept {
     /**
      * 角色ID
      */
-    private Long roleId;
+    private String roleId;
 
     /**
      * 部门ID
      */
-    private Long deptId;
+    private String deptId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -19,11 +19,11 @@ public class SysRoleMenu {
     /**
      * 角色ID
      */
-    private Long roleId;
+    private String roleId;
 
     /**
      * 菜单ID
      */
-    private Long menuId;
+    private String menuId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -19,7 +19,7 @@ public class SysUserPost {
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 岗位ID

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -19,11 +19,11 @@ public class SysUserRole {
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 角色ID
      */
-    private Long roleId;
+    private String roleId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java

@@ -26,7 +26,7 @@ public class SysUserExportVo implements Serializable {
 	 * 用户ID
 	 */
 	@ExcelProperty(value = "用户序号")
-	private Long userId;
+	private String userId;
 
 	/**
 	 * 用户账号

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java

@@ -24,13 +24,13 @@ public class SysUserImportVo implements Serializable {
 	 * 用户ID
 	 */
 	@ExcelProperty(value = "用户序号")
-	private Long userId;
+	private String userId;
 
 	/**
 	 * 部门ID
 	 */
 	@ExcelProperty(value = "部门编号")
-	private Long deptId;
+	private String deptId;
 
 	/**
 	 * 用户账号

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -28,7 +28,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+    public List<Integer> selectDeptListByRoleId(@Param("roleId") String roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
 	/**
 	 * 修改子元素关系

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -34,7 +34,7 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
      * @param userId 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    public List<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据用户ID查询菜单
@@ -49,7 +49,7 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -58,6 +58,6 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
      * @param menuCheckStrictly 菜单树选择项是否关联显示
      * @return 选中菜单列表
      */
-    public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+    public List<Integer> selectMenuListByRoleId(@Param("roleId") String roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -18,7 +18,7 @@ public interface SysPostMapper extends BaseMapperPlus<SysPost> {
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListByUserId(String userId);
 
     /**
      * 查询用户所属岗位组

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -30,7 +30,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionByUserId(String userId);
 
 
     /**
@@ -39,7 +39,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListByUserId(String userId);
 
     /**
      * 根据用户ID查询角色

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -54,6 +54,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser> {
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -42,7 +42,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param roleId 角色ID
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(Long roleId);
+    public List<Integer> selectDeptListByRoleId(String roleId);
 
     /**
      * 根据部门ID查询信息
@@ -50,7 +50,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(String deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -58,7 +58,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public long selectNormalChildrenDeptById(Long deptId);
+    public long selectNormalChildrenDeptById(String deptId);
 
     /**
      * 是否存在部门子节点
@@ -66,7 +66,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+    public boolean hasChildByDeptId(String deptId);
 
     /**
      * 查询部门是否存在用户
@@ -74,7 +74,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+    public boolean checkDeptExistUser(String deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -89,7 +89,7 @@ public interface ISysDeptService extends IService<SysDept> {
      *
      * @param deptId 部门id
      */
-    public void checkDeptDataScope(Long deptId);
+    public void checkDeptDataScope(String deptId);
 
     /**
      * 新增保存部门信息
@@ -113,5 +113,5 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(String deptId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -20,7 +20,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(Long userId);
+    public List<SysMenu> selectMenuList(String userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -29,7 +29,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId);
 
     /**
      * 根据用户ID查询权限
@@ -37,7 +37,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+    public Set<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据用户ID查询菜单树信息
@@ -45,7 +45,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -53,7 +53,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param roleId 角色ID
      * @return 选中菜单列表
      */
-    public List<Integer> selectMenuListByRoleId(Long roleId);
+    public List<Integer> selectMenuListByRoleId(String roleId);
 
     /**
      * 构建前端路由所需要的菜单
@@ -85,7 +85,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param menuId 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    public SysMenu selectMenuById(String menuId);
 
     /**
      * 是否存在菜单子节点
@@ -93,7 +93,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId(Long menuId);
+    public boolean hasChildByMenuId(String menuId);
 
     /**
      * 查询菜单是否存在角色
@@ -101,7 +101,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole(Long menuId);
+    public boolean checkMenuExistRole(String menuId);
 
     /**
      * 新增保存菜单信息
@@ -125,7 +125,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    public int deleteMenuById(String menuId);
 
     /**
      * 校验菜单名称是否唯一

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -45,7 +45,7 @@ public interface ISysPostService extends IService<SysPost> {
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListByUserId(String userId);
 
     /**
      * 校验岗位名称

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -32,7 +32,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserId(Long userId);
+    public List<SysRole> selectRolesByUserId(String userId);
 
     /**
      * 根据用户ID查询角色权限
@@ -40,7 +40,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public Set<String> selectRolePermissionByUserId(String userId);
 
     /**
      * 查询所有角色
@@ -55,7 +55,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListByUserId(String userId);
 
     /**
      * 通过角色ID查询角色
@@ -63,7 +63,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param roleId 角色ID
      * @return 角色对象信息
      */
-    public SysRole selectRoleById(Long roleId);
+    public SysRole selectRoleById(String roleId);
 
     /**
      * 校验角色名称是否唯一
@@ -93,7 +93,7 @@ public interface ISysRoleService extends IService<SysRole> {
      *
      * @param roleId 角色id
      */
-    public void checkRoleDataScope(Long roleId);
+    public void checkRoleDataScope(String roleId);
 
     /**
      * 通过角色ID查询角色使用数量
@@ -101,7 +101,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param roleId 角色ID
      * @return 结果
      */
-    public long countUserRoleByRoleId(Long roleId);
+    public long countUserRoleByRoleId(String roleId);
 
     /**
      * 新增保存角色信息
@@ -141,7 +141,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param roleId 角色ID
      * @return 结果
      */
-    public int deleteRoleById(Long roleId);
+    public int deleteRoleById(String roleId);
 
     /**
      * 批量删除角色信息
@@ -149,7 +149,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param roleIds 需要删除的角色ID
      * @return 结果
      */
-    public int deleteRoleByIds(Long[] roleIds);
+    public int deleteRoleByIds(String[] roleIds);
 
     /**
      * 取消授权用户角色
@@ -166,7 +166,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userIds 需要取消授权的用户数据ID
      * @return 结果
      */
-    public int deleteAuthUsers(Long roleId, Long[] userIds);
+    public int deleteAuthUsers(String roleId, String[] userIds);
 
     /**
      * 批量选择授权用户角色
@@ -175,5 +175,5 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-    public int insertAuthUsers(Long roleId, Long[] userIds);
+    public int insertAuthUsers(String roleId, String[] userIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -54,7 +54,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -108,7 +108,7 @@ public interface ISysUserService extends IService<SysUser> {
      *
      * @param userId 用户id
      */
-    public void checkUserDataScope(Long userId);
+    public void checkUserDataScope(String userId);
 
     /**
      * 新增用户信息
@@ -140,7 +140,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserAuth(Long userId, Long[] roleIds);
+    public void insertUserAuth(String userId, String[] roleIds);
 
     /**
      * 修改用户状态
@@ -190,7 +190,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(String userId);
 
     /**
      * 批量删除用户信息
@@ -198,7 +198,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(String[] userIds);
 
     /**
      * 导入用户数据

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.annotation.DataScope;
@@ -60,8 +61,8 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      */
     @Override
     public List<SysDept> buildDeptTree(List<SysDept> depts) {
-        List<SysDept> returnList = new ArrayList<SysDept>();
-        List<Long> tempList = new ArrayList<Long>();
+        List<SysDept> returnList = new ArrayList<>();
+        List<String> tempList = new ArrayList<>();
         for (SysDept dept : depts) {
             tempList.add(dept.getDeptId());
         }
@@ -97,7 +98,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 选中部门列表
      */
     @Override
-    public List<Integer> selectDeptListByRoleId(Long roleId) {
+    public List<Integer> selectDeptListByRoleId(String roleId) {
         SysRole role = roleMapper.selectById(roleId);
         return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
     }
@@ -109,7 +110,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId) {
+    public SysDept selectDeptById(String deptId) {
         return getById(deptId);
     }
 
@@ -120,7 +121,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 子部门数
      */
     @Override
-    public long selectNormalChildrenDeptById(Long deptId) {
+    public long selectNormalChildrenDeptById(String deptId) {
         return count(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getStatus, 0)
                 .apply("find_in_set({0}, ancestors)", deptId));
@@ -133,7 +134,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId) {
+    public boolean hasChildByDeptId(String deptId) {
         long result = count(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getParentId, deptId)
                 .last("limit 1"));
@@ -147,7 +148,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId) {
+    public boolean checkDeptExistUser(String deptId) {
         long result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getDeptId, deptId));
         return result > 0;
@@ -161,12 +162,12 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      */
     @Override
     public String checkDeptNameUnique(SysDept dept) {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        String deptId = StrUtil.isBlank(dept.getDeptId()) ? "-1" : dept.getDeptId();
         SysDept info = getOne(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getDeptName, dept.getDeptName())
                 .eq(SysDept::getParentId, dept.getParentId())
                 .last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
+        if (StringUtils.isNotNull(info) && !info.getDeptId().equals(deptId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -178,7 +179,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @param deptId 部门id
      */
     @Override
-    public void checkDeptDataScope(Long deptId) {
+    public void checkDeptDataScope(String deptId) {
         if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysDept dept = new SysDept();
             dept.setDeptId(deptId);
@@ -238,7 +239,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      */
     private void updateParentDeptStatusNormal(SysDept dept) {
 		String ancestors = dept.getAncestors();
-		Long[] deptIds = Convert.toLongArray(ancestors);
+        String[] deptIds = Convert.toStrArray(ancestors);
         update(null, new LambdaUpdateWrapper<SysDept>()
                 .set(SysDept::getStatus, "0")
                 .in(SysDept::getDeptId, Arrays.asList(deptIds)));
@@ -251,7 +252,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
+    public void updateDeptChildren(String deptId, String newAncestors, String oldAncestors) {
         List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
                 .apply("find_in_set({0},ancestors)",deptId));
         for (SysDept child : children) {
@@ -269,7 +270,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId) {
+    public int deleteDeptById(String deptId) {
         return baseMapper.deleteById(deptId);
     }
 
@@ -291,9 +292,9 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * 得到子节点列表
      */
     private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
-        List<SysDept> tlist = new ArrayList<SysDept>();
+        List<SysDept> tlist = new ArrayList<>();
 		for (SysDept n : list) {
-			if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
+			if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().equals(t.getDeptId())) {
 				tlist.add(n);
 			}
 		}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
@@ -45,7 +46,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId) {
+    public List<SysMenu> selectMenuList(String userId) {
         return selectMenuList(new SysMenu(), userId);
     }
 
@@ -56,7 +57,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId) {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
         if (SysUser.isAdmin(userId)) {
@@ -80,7 +81,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId) {
+    public Set<String> selectMenuPermsByUserId(String userId) {
         List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
         for (String perm : perms) {
@@ -98,7 +99,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId) {
+    public List<SysMenu> selectMenuTreeByUserId(String userId) {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId)) {
             menus = baseMapper.selectMenuTreeAll();
@@ -115,7 +116,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 选中菜单列表
      */
     @Override
-    public List<Integer> selectMenuListByRoleId(Long roleId) {
+    public List<Integer> selectMenuListByRoleId(String roleId) {
         SysRole role = roleMapper.selectById(roleId);
         return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }
@@ -178,7 +179,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
     @Override
     public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
-        List<Long> tempList = new ArrayList<Long>();
+        List<String> tempList = new ArrayList<>();
         for (SysMenu dept : menus) {
             tempList.add(dept.getMenuId());
         }
@@ -214,7 +215,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId) {
+    public SysMenu selectMenuById(String menuId) {
         return getById(menuId);
     }
 
@@ -225,7 +226,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuId(Long menuId) {
+    public boolean hasChildByMenuId(String menuId) {
         long result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId,menuId));
         return result > 0;
     }
@@ -237,7 +238,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRole(Long menuId) {
+    public boolean checkMenuExistRole(String menuId) {
         long result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId,menuId));
         return result > 0;
     }
@@ -271,7 +272,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 结果
      */
     @Override
-    public int deleteMenuById(Long menuId) {
+    public int deleteMenuById(String menuId) {
         return baseMapper.deleteById(menuId);
     }
 
@@ -283,12 +284,12 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      */
     @Override
     public String checkMenuNameUnique(SysMenu menu) {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
+        String menuId = StrUtil.isBlank(menu.getMenuId()) ? "-1" : menu.getMenuId();
         SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
                 .eq(SysMenu::getMenuName,menu.getMenuName())
                 .eq(SysMenu::getParentId,menu.getParentId())
                 .last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
+        if (StringUtils.isNotNull(info) && !info.getMenuId().equals(menuId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -424,7 +425,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
     private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
         List<SysMenu> tlist = new ArrayList<SysMenu>();
 		for (SysMenu n : list) {
-			if (n.getParentId().longValue() == t.getMenuId().longValue()) {
+			if (n.getParentId().equals(t.getMenuId())) {
 				tlist.add(n);
 			}
 		}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -80,7 +80,7 @@ public class SysPostServiceImpl extends ServicePlusImpl<SysPostMapper, SysPost,
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Integer> selectPostListByUserId(Long userId) {
+    public List<Integer> selectPostListByUserId(String userId) {
         return baseMapper.selectPostListByUserId(userId);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
@@ -68,12 +69,12 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRolesByUserId(Long userId) {
+    public List<SysRole> selectRolesByUserId(String userId) {
         List<SysRole> userRoles = baseMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
         for (SysRole role : roles) {
             for (SysRole userRole : userRoles) {
-                if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) {
+                if (role.getRoleId().equals(userRole.getRoleId())) {
                     role.setFlag(true);
                     break;
                 }
@@ -89,7 +90,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId) {
+    public Set<String> selectRolePermissionByUserId(String userId) {
         List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
         for (SysRole perm : perms) {
@@ -117,7 +118,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 选中角色ID列表
      */
     @Override
-    public List<Integer> selectRoleListByUserId(Long userId) {
+    public List<Integer> selectRoleListByUserId(String userId) {
         return baseMapper.selectRoleListByUserId(userId);
     }
 
@@ -128,7 +129,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 角色对象信息
      */
     @Override
-    public SysRole selectRoleById(Long roleId) {
+    public SysRole selectRoleById(String roleId) {
         return getById(roleId);
     }
 
@@ -140,10 +141,10 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      */
     @Override
     public String checkRoleNameUnique(SysRole role) {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        String roleId = StrUtil.isBlank(role.getRoleId()) ? "-1" : role.getRoleId();
         SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getRoleName, role.getRoleName()).last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+        if (StringUtils.isNotNull(info) && !info.getRoleId().equals(roleId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -157,10 +158,10 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      */
     @Override
     public String checkRoleKeyUnique(SysRole role) {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        String roleId = StrUtil.isBlank(role.getRoleId()) ? "-1" : role.getRoleId();
         SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getRoleKey, role.getRoleKey()).last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+        if (StringUtils.isNotNull(info) && !info.getRoleId().equals(roleId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -184,7 +185,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @param roleId 角色id
      */
     @Override
-    public void checkRoleDataScope(Long roleId) {
+    public void checkRoleDataScope(String roleId) {
         if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysRole role = new SysRole();
             role.setRoleId(roleId);
@@ -202,7 +203,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 结果
      */
     @Override
-    public long countUserRoleByRoleId(Long roleId) {
+    public long countUserRoleByRoleId(String roleId) {
         return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
     }
 
@@ -273,7 +274,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
         int rows = 1;
         // 新增用户与角色管理
         List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        for (Long menuId : role.getMenuIds()) {
+        for (String menuId : role.getMenuIds()) {
             SysRoleMenu rm = new SysRoleMenu();
             rm.setRoleId(role.getRoleId());
             rm.setMenuId(menuId);
@@ -294,7 +295,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
         int rows = 1;
         // 新增角色与部门（数据权限）管理
         List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds()) {
+        for (String deptId : role.getDeptIds()) {
             SysRoleDept rd = new SysRoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);
@@ -314,7 +315,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      */
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId) {
+    public int deleteRoleById(String roleId) {
         // 删除角色与菜单关联
         roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
         // 删除角色与部门关联
@@ -330,15 +331,15 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      */
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds) {
-        for (Long roleId : roleIds) {
+    public int deleteRoleByIds(String[] roleIds) {
+        for (String roleId : roleIds) {
             checkRoleAllowed(new SysRole(roleId));
             SysRole role = selectRoleById(roleId);
             if (countUserRoleByRoleId(roleId) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
-        List<Long> ids = Arrays.asList(roleIds);
+        List<String> ids = Arrays.asList(roleIds);
         // 删除角色与菜单关联
         roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
         // 删除角色与部门关联
@@ -367,7 +368,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 结果
      */
     @Override
-    public int deleteAuthUsers(Long roleId, Long[] userIds) {
+    public int deleteAuthUsers(String roleId, String[] userIds) {
 		return userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
 			.eq(SysUserRole::getRoleId, roleId)
 			.in(SysUserRole::getUserId, Arrays.asList(userIds)));
@@ -381,11 +382,11 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds) {
+    public int insertAuthUsers(String roleId, String[] userIds) {
         // 新增用户与角色管理
 		int rows = 1;
 		List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds) {
+        for (String userId : userIds) {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
             ur.setRoleId(roleId);

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.annotation.DataScope;
@@ -112,7 +113,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId) {
+    public SysUser selectUserById(String userId) {
         return baseMapper.selectUserById(userId);
     }
 
@@ -177,11 +178,11 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      */
     @Override
     public String checkPhoneUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = StrUtil.isBlank(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
                 .select(SysUser::getUserId, SysUser::getPhonenumber)
                 .eq(SysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+        if (StringUtils.isNotNull(info) && info.getUserId().equals(userId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -195,11 +196,11 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      */
     @Override
     public String checkEmailUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = StrUtil.isBlank(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
                 .select(SysUser::getUserId, SysUser::getEmail)
                 .eq(SysUser::getEmail, user.getEmail()).last("limit 1"));
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+        if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -223,7 +224,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId) {
+    public void checkUserDataScope(String userId) {
         if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysUser user = new SysUser();
             user.setUserId(userId);
@@ -272,7 +273,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
     @Override
     @Transactional
     public int updateUser(SysUser user) {
-        Long userId = user.getUserId();
+        String userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
         // 新增用户与角色管理
@@ -292,7 +293,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
+    public void insertUserAuth(String userId, String[] roleIds)
     {
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
 			.eq(SysUserRole::getUserId, userId));
@@ -368,11 +369,11 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      * @param user 用户对象
      */
     public void insertUserRole(SysUser user) {
-        Long[] roles = user.getRoleIds();
+        String[] roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles)) {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roles) {
+            for (String roleId : roles) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
@@ -412,11 +413,11 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds) {
+    public void insertUserRole(String userId, String[] roleIds) {
         if (StringUtils.isNotNull(roleIds)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roleIds) {
+            List<SysUserRole> list = new ArrayList<>();
+            for (String roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
@@ -436,7 +437,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId) {
+    public int deleteUserById(String userId) {
         // 删除用户与角色关联
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
         // 删除用户与岗位表
@@ -452,11 +453,11 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds) {
-        for (Long userId : userIds) {
+    public int deleteUserByIds(String[] userIds) {
+        for (String userId : userIds) {
             checkUserAllowed(new SysUser(userId));
         }
-        List<Long> ids = Arrays.asList(userIds);
+        List<String> ids = Arrays.asList(userIds);
         // 删除用户与角色关联
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
         // 删除用户与岗位表

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -95,12 +95,12 @@
         order by r.role_sort
     </select>
 
-    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+    <select id="selectRolePermissionByUserId" parameterType="string" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
         WHERE r.del_flag = '0' and ur.user_id = #{userId}
     </select>
 
-    <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+    <select id="selectRoleListByUserId" parameterType="string" resultType="Integer">
         select r.role_id
         from sys_role r
                  left join sys_user_role ur on ur.role_id = r.role_id