1、long都改成string传输

2、包整理

.idea/workspace.xml

@@ -4,25 +4,70 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、新增、修改用户，关联角色表、部门表">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/entity/SysRoleMenuAddVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/controller/SysRoleMenuController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/entity/SysRoleMenu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/service/SysRoleMenuService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRolePO.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、角色绑定菜单、获取角色菜单&#10;2、用户信息新增角色信息">
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/entity/PO/SysRoleMenuAddPO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRoleAddPO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/entity/SysMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/entity/SysMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/entity/PO/SysMenuSearchPO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/service/SysMenuService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/entity/SysOrg.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/entity/PO/SysOrgSearchPO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/SysOrgService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/service/SysOrgService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/entity/SysRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/entity/SysRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/entity/SysRoleMenuAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/entity/VO/SysRoleMenuAddVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/SysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/service/SysRoleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/controller/SysRoleMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/controller/SysRoleMenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/entity/SysRoleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/entity/SysRoleMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/service/SysRoleMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/service/SysRoleMenuService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/SysUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/PO/UserDetailPO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserEditVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserEditVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserSearchVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/controller/SysUserDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/controller/SysUserDetailController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetailAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/entity/VO/SysUserDetailAddVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/service/SysUserDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/service/SysUserDetailService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserDetail/service/impl/SysUserDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/controller/SysUserOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/controller/SysUserOrgController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/entity/SysUserOrg.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/entity/SysUserOrg.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/mapper/SysUserOrgMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/mapper/SysUserOrgMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/service/SysUserOrgService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/service/SysUserOrgService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserOrg/service/impl/SysUserOrgServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/controller/SysUserRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/controller/SysUserRoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/entity/SysUserRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/entity/VO/SysUserRoleAddVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRolePO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRolePO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/service/SysUserRoleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -81,6 +126,7 @@
     "Spring Boot.Application.executor": "Debug",
     "jdk.selected.JAVA_MODULE": "1.8",
     "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/setin/IdeaProjects/GeneralFrame/application/src/main/java/com/ctsi/System",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -108,11 +154,11 @@
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\java\com\ctsi" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.ctsi.System.SysRole.entity.PO" />
+      <recent name="com.ctsi.System.SysUserRole.entity.PO" />
       <recent name="com.ctsi.SysUserRole.entity" />
       <recent name="com.ctsi.SysRole.entity" />
       <recent name="com.ctsi.SysUserDetail.entity" />
-      <recent name="com.ctsi.SysMenu.entity" />
-      <recent name="com.ctsi.SysOrg.entity" />
     </key>
   </component>
   <component name="RunManager">
@@ -142,7 +188,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
-      <workItem from="1704932572547" duration="24466000" />
+      <workItem from="1704932572547" duration="29981000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -256,12 +302,55 @@
       <option name="project" value="LOCAL" />
       <updated>1705023054528</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="1、新增角色菜单表">
+      <option name="closed" value="true" />
+      <created>1705029738702</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1705029738702</updated>
+    </task>
+    <task id="LOCAL-00016" summary="1、获取用户菜单树">
+      <option name="closed" value="true" />
+      <created>1705029773833</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1705029773833</updated>
+    </task>
+    <task id="LOCAL-00017" summary="1、角色绑定菜单、获取角色菜单&#10;2、用户信息新增角色信息">
+      <option name="closed" value="true" />
+      <created>1705029883204</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1705029883204</updated>
+    </task>
+    <task id="LOCAL-00018" summary="1、角色绑定菜单、获取角色菜单&#10;2、用户信息新增角色信息">
+      <option name="closed" value="true" />
+      <created>1705029901583</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1705029901583</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="基础框架配置" />
@@ -278,7 +367,10 @@
     <MESSAGE value="1、优化import" />
     <MESSAGE value="1、用户部门接口" />
     <MESSAGE value="1、新增、修改用户，关联角色表、部门表" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、新增、修改用户，关联角色表、部门表" />
+    <MESSAGE value="1、新增角色菜单表" />
+    <MESSAGE value="1、获取用户菜单树" />
+    <MESSAGE value="1、角色绑定菜单、获取角色菜单&#10;2、用户信息新增角色信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、角色绑定菜单、获取角色菜单&#10;2、用户信息新增角色信息" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

application/src/main/java/com/ctsi/Application.java

@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
 
 @SpringBootApplication(scanBasePackages = {"com.ctsi.*"})
-@MapperScan("com.ctsi.*.mapper")
+@MapperScan("com.ctsi.System.*.mapper")
 public class Application {
     private static final Logger log = LoggerFactory.getLogger(Application.class);
     private static final String SWAGGER_PAGE = "swagger-ui/index.html";

application/src/main/java/com/ctsi/Auth/web/login.java

@@ -2,11 +2,10 @@ package com.ctsi.Auth.web;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.ctsi.Auth.entity.UserForm;
-import com.ctsi.SysMenu.entity.SysMenu;
-import com.ctsi.SysMenu.entity.SysMenuSearchPO;
-import com.ctsi.SysMenu.service.SysMenuService;
-import com.ctsi.SysUser.entity.SysUser;
-import com.ctsi.SysUser.service.SysUserService;
+import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
+import com.ctsi.System.SysMenu.service.SysMenuService;
+import com.ctsi.System.SysUser.entity.SysUser;
+import com.ctsi.System.SysUser.service.SysUserService;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.utils.PasswordEncoderUtil;
 import io.swagger.annotations.Api;

application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java → application/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysMenu.controller;
+package com.ctsi.System.SysMenu.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysMenu.entity.SysMenu;
-import com.ctsi.SysMenu.entity.SysMenuSearchPO;
-import com.ctsi.SysMenu.service.SysMenuService;
+import com.ctsi.System.SysMenu.entity.SysMenu;
+import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
+import com.ctsi.System.SysMenu.service.SysMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java → application/src/main/java/com/ctsi/System/SysMenu/entity/PO/SysMenuSearchPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysMenu.entity;
+package com.ctsi.System.SysMenu.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,6 +28,7 @@ public class SysMenuSearchPO implements Serializable,Cloneable{
    private String menuTitle ;
    /** 父级 */
    @ApiModelProperty(value = "父级",notes = "")
+   @JsonSerialize(using = LongtoStringSerialize.class)
    private Long parentId ;
    /** 编码 */
    @ApiModelProperty(value = "编码",notes = "")

application/src/main/java/com/ctsi/SysMenu/entity/SysMenu.java → application/src/main/java/com/ctsi/System/SysMenu/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysMenu.entity;
+package com.ctsi.System.SysMenu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -34,6 +34,7 @@ public class SysMenu implements Serializable,Cloneable{
     private String menuTitle ;
     /** 父级 */
     @ApiModelProperty(value = "父级",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long parentId ;
     /** 编码 */
     @ApiModelProperty(value = "编码",notes = "")

application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java → application/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysMenu.mapper;
+package com.ctsi.System.SysMenu.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysMenu.entity.SysMenu;
+import com.ctsi.System.SysMenu.entity.SysMenu;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.xml → application/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysMenu.mapper.SysMenuMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysMenu.entity.SysMenu">
+<mapper namespace="com.ctsi.System.SysMenu.mapper.SysMenuMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysMenu.entity.SysMenu">
         select * from sys_menu ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java → application/src/main/java/com/ctsi/System/SysMenu/service/SysMenuService.java

@@ -1,8 +1,8 @@
-package com.ctsi.SysMenu.service;
+package com.ctsi.System.SysMenu.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysMenu.entity.SysMenu;
-import com.ctsi.SysMenu.entity.SysMenuSearchPO;
+import com.ctsi.System.SysMenu.entity.SysMenu;
+import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
 
 import java.util.List;
 

application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java → application/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.ctsi.SysMenu.service.impl;
+package com.ctsi.System.SysMenu.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysMenu.entity.SysMenu;
-import com.ctsi.SysMenu.entity.SysMenuSearchPO;
-import com.ctsi.SysMenu.mapper.SysMenuMapper;
-import com.ctsi.SysMenu.service.SysMenuService;
-import com.ctsi.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.SysUserRole.entity.SysUserRole;
+import com.ctsi.System.SysMenu.entity.SysMenu;
+import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
+import com.ctsi.System.SysMenu.mapper.SysMenuMapper;
+import com.ctsi.System.SysMenu.service.SysMenuService;
+import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.System.SysUserRole.entity.SysUserRole;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java → application/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysOrg.controller;
+package com.ctsi.System.SysOrg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysOrg.entity.SysOrg;
-import com.ctsi.SysOrg.entity.SysOrgSearchPO;
-import com.ctsi.SysOrg.service.SysOrgService;
+import com.ctsi.System.SysOrg.entity.SysOrg;
+import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
+import com.ctsi.System.SysOrg.service.SysOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java → application/src/main/java/com/ctsi/System/SysOrg/entity/PO/SysOrgSearchPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysOrg.entity;
+package com.ctsi.System.SysOrg.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -31,6 +31,7 @@ public class SysOrgSearchPO implements Serializable,Cloneable{
    private String description ;
    /** 父级 */
    @ApiModelProperty(value = "父级",notes = "")
+   @JsonSerialize(using = LongtoStringSerialize.class)
    private Long parentId ;
    @ApiModelProperty(value = "子部门",notes = "")
    private List<SysOrgSearchPO> children;

application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java → application/src/main/java/com/ctsi/System/SysOrg/entity/SysOrg.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysOrg.entity;
+package com.ctsi.System.SysOrg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -40,6 +40,7 @@ public class SysOrg implements Serializable,Cloneable{
     private String description ;
     /** 父级 */
     @ApiModelProperty(value = "父级",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long parentId ;
     /** 排序 */
     @ApiModelProperty(value = "排序",notes = "")

application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java → application/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysOrg.mapper;
+package com.ctsi.System.SysOrg.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysOrg.entity.SysOrg;
+import com.ctsi.System.SysOrg.entity.SysOrg;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.xml → application/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysOrg.mapper.SysOrgMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysOrg.entity.SysOrg">
+<mapper namespace="com.ctsi.System.SysOrg.mapper.SysOrgMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysOrg.entity.SysOrg">
         select * from sys_org ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysOrg/service/SysOrgService.java → application/src/main/java/com/ctsi/System/SysOrg/service/SysOrgService.java

@@ -1,8 +1,8 @@
-package com.ctsi.SysOrg.service;
+package com.ctsi.System.SysOrg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysOrg.entity.SysOrg;
-import com.ctsi.SysOrg.entity.SysOrgSearchPO;
+import com.ctsi.System.SysOrg.entity.SysOrg;
+import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
 
 /**
  * 部门信息表;(sys_org)表服务接口

application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java → application/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.SysOrg.service.impl;
+package com.ctsi.System.SysOrg.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysOrg.entity.SysOrg;
-import com.ctsi.SysOrg.entity.SysOrgSearchPO;
-import com.ctsi.SysOrg.mapper.SysOrgMapper;
-import com.ctsi.SysOrg.service.SysOrgService;
+import com.ctsi.System.SysOrg.entity.SysOrg;
+import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
+import com.ctsi.System.SysOrg.mapper.SysOrgMapper;
+import com.ctsi.System.SysOrg.service.SysOrgService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.*;
  * @date : 2024-1-10
  */
 @Service
-public class SysOrgServiceImpl implements SysOrgService{
+public class SysOrgServiceImpl implements SysOrgService {
     @Autowired
     private SysOrgMapper sysOrgMapper;
     

application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java → application/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java

@@ -1,11 +1,11 @@
-package com.ctsi.SysRole.controller;
+package com.ctsi.System.SysRole.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysRole.entity.SysRole;
-import com.ctsi.SysRole.entity.SysRoleMenuAddVO;
-import com.ctsi.SysRole.service.SysRoleService;
-import com.ctsi.SysRoleMenu.service.SysRoleMenuService;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
+import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
+import com.ctsi.System.SysRole.entity.SysRole;
+import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
+import com.ctsi.System.SysRole.service.SysRoleService;
+import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -141,7 +141,7 @@ public class SysRoleController{
       */
      @ApiOperation("获取角色菜单信息")
      @GetMapping("/getRoleMenus")
-     public ApiResult<SysRoleMenuAddVO> getRoleMenus(Long roleId){
+     public ApiResult<SysRoleMenuAddPO> getRoleMenus(Long roleId){
          try {
              return ApiResult.success(sysRoleMenuService.getRoleMenus(roleId));
          } catch (Exception e) {

application/src/main/java/com/ctsi/System/SysRole/entity/PO/SysRoleMenuAddPO.java

@@ -0,0 +1,44 @@
+package com.ctsi.System.SysRole.entity.PO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ctsi.utils.LongtoStringSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+* 角色菜单表;
+* @author : machaoyi
+* @date : 2024-1-12
+*/
+@ApiModel(value = "角色菜单表新增PO",description = "")
+@TableName("sys_role_menu")
+public class SysRoleMenuAddPO implements Serializable,Cloneable{
+   /** 角色id */
+   @ApiModelProperty(value = "角色id",notes = "")
+   @JsonSerialize(using = LongtoStringSerialize.class)
+   private Long roleId ;
+   /** 菜单id */
+   @ApiModelProperty(value = "菜单id",notes = "")
+   private List<String> menuId ;
+
+   /** 角色id */
+   public Long getRoleId(){
+       return this.roleId;
+   }
+   /** 角色id */
+   public void setRoleId(Long roleId){
+       this.roleId=roleId;
+   }
+   /** 菜单id */
+   public List<String> getMenuId(){
+       return this.menuId;
+   }
+   /** 菜单id */
+   public void setMenuId(List<String> menuId){
+       this.menuId=menuId;
+   }
+}

application/src/main/java/com/ctsi/SysRole/entity/SysRole.java → application/src/main/java/com/ctsi/System/SysRole/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysRole.entity;
+package com.ctsi.System.SysRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysRole/entity/SysRoleMenuAddVO.java → application/src/main/java/com/ctsi/System/SysRole/entity/VO/SysRoleMenuAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysRole.entity;
+package com.ctsi.System.SysRole.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java → application/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.java

@@ -1,10 +1,10 @@
-package com.ctsi.SysRole.mapper;
+package com.ctsi.System.SysRole.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysRole.entity.SysRole;
+import com.ctsi.System.SysRole.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.xml → application/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysRole.mapper.SysRoleMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysRole.entity.SysRole">
+<mapper namespace="com.ctsi.System.SysRole.mapper.SysRoleMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysRole.entity.SysRole">
         select * from sys_role ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysRole/service/SysRoleService.java → application/src/main/java/com/ctsi/System/SysRole/service/SysRoleService.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysRole.service;
+package com.ctsi.System.SysRole.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysRole.entity.SysRole;
+import com.ctsi.System.SysRole.entity.SysRole;
 
- /**
+/**
  * 角色表;(sys_role)表服务接口
  * @author : machaoyi
  * @date : 2024-1-11

application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java → application/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.SysRole.service.impl;
+package com.ctsi.System.SysRole.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysRole.entity.SysRole;
-import com.ctsi.SysRole.mapper.SysRoleMapper;
-import com.ctsi.SysRole.service.SysRoleService;
+import com.ctsi.System.SysRole.entity.SysRole;
+import com.ctsi.System.SysRole.mapper.SysRoleMapper;
+import com.ctsi.System.SysRole.service.SysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  /**

application/src/main/java/com/ctsi/SysRoleMenu/controller/SysRoleMenuController.java → application/src/main/java/com/ctsi/System/SysRoleMenu/controller/SysRoleMenuController.java

@@ -1,16 +1,14 @@
-package com.ctsi.SysRoleMenu.controller;
+package com.ctsi.System.SysRoleMenu.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
+import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.SysRoleMenu.service.SysRoleMenuService;
+import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 
 import javax.annotation.Resource;
 

application/src/main/java/com/ctsi/SysRoleMenu/entity/SysRoleMenu.java → application/src/main/java/com/ctsi/System/SysRoleMenu/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysRoleMenu.entity;
+package com.ctsi.System.SysRoleMenu.entity;
 
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -24,9 +24,11 @@ public class SysRoleMenu implements Serializable,Cloneable{
     private Long id ;
     /** 角色id */
     @ApiModelProperty(value = "角色id",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long roleId ;
     /** 菜单id */
     @ApiModelProperty(value = "菜单id",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long menuId ;
 
     /** 主键id */

application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.java → application/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.java

@@ -1,14 +1,14 @@
-package com.ctsi.SysRoleMenu.mapper;
+package com.ctsi.System.SysRoleMenu.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysRoleMenu.entity.SysRoleMenu;
 
- /**
+/**
  * 角色菜单表;(sys_role_menu)表数据库访问层
  * @author : machaoyi
  * @date : 2024-1-12

application/src/main/java/com/ctsi/SysRoleMenu/mapper/SysRoleMenuMapper.xml → application/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysRoleMenu.mapper.SysRoleMenuMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysRoleMenu.entity.SysRoleMenu">
+<mapper namespace="com.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysRoleMenu.entity.SysRoleMenu">
         select * from sys_role_menu ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysRoleMenu/service/SysRoleMenuService.java → application/src/main/java/com/ctsi/System/SysRoleMenu/service/SysRoleMenuService.java

@@ -1,8 +1,9 @@
-package com.ctsi.SysRoleMenu.service;
+package com.ctsi.System.SysRoleMenu.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysRole.entity.SysRoleMenuAddVO;
-import com.ctsi.SysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
+import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
+import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 
  /**
  * 角色菜单表;(sys_role_menu)表服务接口
@@ -52,5 +53,5 @@ public interface SysRoleMenuService{
 
      SysRoleMenuAddVO save(SysRoleMenuAddVO SysRoleMenuAddVO);
 
-     SysRoleMenuAddVO getRoleMenus(Long roleId);
+     SysRoleMenuAddPO getRoleMenus(Long roleId);
 }

application/src/main/java/com/ctsi/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java → application/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java

@@ -1,18 +1,16 @@
-package com.ctsi.SysRoleMenu.service.impl;
+package com.ctsi.System.SysRoleMenu.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.ctsi.SysRole.entity.SysRoleMenuAddVO;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
+import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
+import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
+import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.ctsi.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.SysRoleMenu.mapper.SysRoleMenuMapper;
-import com.ctsi.SysRoleMenu.service.SysRoleMenuService;
+import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +21,7 @@ import java.util.List;
  * @date : 2024-1-12
  */
 @Service
-public class SysRoleMenuServiceImpl implements SysRoleMenuService{
+public class SysRoleMenuServiceImpl implements SysRoleMenuService {
     @Autowired
     private SysRoleMenuMapper sysRoleMenuMapper;
     
@@ -125,17 +123,17 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService{
       * @param roleId 角色id
       * @return 实例对象
       */
-     public SysRoleMenuAddVO getRoleMenus(Long roleId){
-         SysRoleMenuAddVO SysRoleMenuAddVO = new SysRoleMenuAddVO();
-         SysRoleMenuAddVO.setRoleId(roleId);
+     public SysRoleMenuAddPO getRoleMenus(Long roleId){
+         SysRoleMenuAddPO sysRoleMenuAddPO = new SysRoleMenuAddPO();
+         sysRoleMenuAddPO.setRoleId(roleId);
          LambdaQueryWrapper<SysRoleMenu> queryWrapper = new LambdaQueryWrapper<>();
          queryWrapper.eq(SysRoleMenu::getRoleId,roleId);
          List<SysRoleMenu> sysRoleMenuList =  sysRoleMenuMapper.selectList(queryWrapper);
-         List<Long> menuId = new ArrayList<>();
+         List<String> menuId = new ArrayList<>();
          for (SysRoleMenu sysRoleMenu : sysRoleMenuList) {
-             menuId.add(sysRoleMenu.getMenuId());
+             menuId.add(sysRoleMenu.getMenuId().toString());
          }
-         SysRoleMenuAddVO.setMenuId(menuId);
-         return SysRoleMenuAddVO;
+         sysRoleMenuAddPO.setMenuId(menuId);
+         return sysRoleMenuAddPO;
      }
 }

application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java → application/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java

@@ -1,14 +1,19 @@
-package com.ctsi.SysUser.controller;
+package com.ctsi.System.SysUser.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUser.entity.*;
-import com.ctsi.SysUser.service.SysUserService;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.SysUserDetail.service.SysUserDetailService;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.SysUserOrg.service.SysUserOrgService;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
-import com.ctsi.SysUserRole.service.SysUserRoleService;
+import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
+import com.ctsi.System.SysUser.entity.VO.UserAddVO;
+import com.ctsi.System.SysUser.entity.VO.UserEditVO;
+import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
+import com.ctsi.System.SysUser.service.SysUserService;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
+import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
+import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
+import com.ctsi.System.SysUserRole.service.SysUserRoleService;
+import com.ctsi.System.SysUser.entity.*;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -193,7 +198,7 @@ public class SysUserController{
       */
      @ApiOperation("获取用户角色信息")
      @GetMapping("/getUserRoles")
-     public ApiResult<SysUserRoleAddVO> getUserRoles(Long id){
+     public ApiResult<SysUserRoleAddPO> getUserRoles(Long id){
          try {
              return ApiResult.success(sysUserRoleService.getUserRoles(id));
          } catch (Exception e) {

application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java → application/src/main/java/com/ctsi/System/SysUser/entity/PO/UserDetailPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUser.entity;
+package com.ctsi.System.SysUser.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ctsi.utils.LongtoStringSerialize;
@@ -41,13 +41,14 @@ public class UserDetailPO implements Serializable,Cloneable{
    private String birthDate ;
    /** 部门id */
    @ApiModelProperty(value = "部门id",notes = "")
+   @JsonSerialize(using = LongtoStringSerialize.class)
    private Long orgId ;
    /** 部门名称 */
    @ApiModelProperty(value = "部门名称",notes = "")
    private String orgName ;
    /** 角色id */
    @ApiModelProperty(value = "角色id",notes = "")
-   private List<Long> roleId ;
+   private List<String> roleId ;
    /** 角色名称 */
    @ApiModelProperty(value = "角色名称",notes = "")
    private List<String> roleName ;
@@ -125,11 +126,11 @@ public class UserDetailPO implements Serializable,Cloneable{
       this.orgName = orgName;
    }
 
-   public List<Long> getRoleId() {
+   public List<String> getRoleId() {
       return roleId;
    }
 
-   public void setRoleId(List<Long> roleId) {
+   public void setRoleId(List<String> roleId) {
       this.roleId = roleId;
    }
 

application/src/main/java/com/ctsi/SysUser/entity/SysUser.java → application/src/main/java/com/ctsi/System/SysUser/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUser.entity;
+package com.ctsi.System.SysUser.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

application/src/main/java/com/ctsi/SysUser/entity/UserAddVO.java → application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUser.entity;
+package com.ctsi.System.SysUser.entity.VO;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application/src/main/java/com/ctsi/SysUser/entity/UserEditVO.java → application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserEditVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUser.entity;
+package com.ctsi.System.SysUser.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ctsi.utils.LongtoStringSerialize;

application/src/main/java/com/ctsi/SysUser/entity/UserSearchVO.java → application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUser.entity;
+package com.ctsi.System.SysUser.entity.VO;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java → application/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysUser.mapper;
+package com.ctsi.System.SysUser.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysUser.entity.SysUser;
+import com.ctsi.System.SysUser.entity.SysUser;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.xml → application/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysUser.mapper.SysUserMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysUser.entity.SysUser">
+<mapper namespace="com.ctsi.System.SysUser.mapper.SysUserMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysUser.entity.SysUser">
         select * from sys_user ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysUser/service/SysUserService.java → application/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysUser.service;
+package com.ctsi.System.SysUser.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUser.entity.SysUser;
-import com.ctsi.SysUser.entity.UserDetailPO;
-import com.ctsi.SysUser.entity.UserSearchVO;
+import com.ctsi.System.SysUser.entity.SysUser;
+import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
+import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
 
 /**
  * 用户表;(sys_user)表服务接口

application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java → application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java

@@ -1,28 +1,27 @@
-package com.ctsi.SysUser.service.impl;
+package com.ctsi.System.SysUser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysOrg.entity.SysOrg;
-import com.ctsi.SysUser.entity.SysUser;
-import com.ctsi.SysUser.entity.UserDetailPO;
-import com.ctsi.SysUser.entity.UserSearchVO;
-import com.ctsi.SysUser.mapper.SysUserMapper;
-import com.ctsi.SysUser.service.SysUserService;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
-import com.ctsi.SysUserRole.service.SysUserRoleService;
+import com.ctsi.System.SysOrg.entity.SysOrg;
+import com.ctsi.System.SysUser.entity.SysUser;
+import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
+import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
+import com.ctsi.System.SysUser.mapper.SysUserMapper;
+import com.ctsi.System.SysUser.service.SysUserService;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
+import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
+import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.ctsi.utils.PasswordEncoderUtil;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 用户表;(sys_user)表服务实现类
@@ -30,7 +29,7 @@ import java.util.List;
  * @date : 2024-1-10
  */
 @Service
-public class SysUserServiceImpl implements SysUserService{
+public class SysUserServiceImpl implements SysUserService {
     @Autowired
     private SysUserMapper sysUserMapper;
     @Resource
@@ -51,9 +50,9 @@ public class SysUserServiceImpl implements SysUserService{
         queryWrapper.leftJoin(SysUserOrg.class, SysUserOrg::getUserId, SysUser::getId);
         queryWrapper.leftJoin(SysOrg.class, SysOrg::getId, SysUserOrg::getOrgId);
         UserDetailPO userDetailPO = sysUserMapper.selectJoinOne(UserDetailPO.class, queryWrapper);
-        SysUserRoleAddVO sysUserRoleAddVO = sysUserRoleService.getUserRoles(id);
-        userDetailPO.setRoleId(sysUserRoleAddVO.getRoleId());
-        userDetailPO.setRoleName(sysUserRoleAddVO.getRoleName());
+        SysUserRoleAddPO sysUserRoleAddPO = sysUserRoleService.getUserRoles(id);
+        userDetailPO.setRoleId(sysUserRoleAddPO.getRoleId());
+        userDetailPO.setRoleName(sysUserRoleAddPO.getRoleName());
         return userDetailPO;
     }
     

application/src/main/java/com/ctsi/SysUserDetail/controller/SysUserDetailController.java → application/src/main/java/com/ctsi/System/SysUserDetail/controller/SysUserDetailController.java

@@ -1,8 +1,8 @@
-package com.ctsi.SysUserDetail.controller;
+package com.ctsi.System.SysUserDetail.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;

application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetail.java → application/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserDetail.entity;
+package com.ctsi.System.SysUserDetail.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetailAddVO.java → application/src/main/java/com/ctsi/System/SysUserDetail/entity/VO/SysUserDetailAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserDetail.entity;
+package com.ctsi.System.SysUserDetail.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.java → application/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.java

@@ -1,10 +1,10 @@
-package com.ctsi.SysUserDetail.mapper;
+package com.ctsi.System.SysUserDetail.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.xml → application/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysUserDetail.mapper.SysUserDetailMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysUserDetail.entity.SysUserDetail">
+<mapper namespace="com.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysUserDetail.entity.SysUserDetail">
         select * from sys_user_detail ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysUserDetail/service/SysUserDetailService.java → application/src/main/java/com/ctsi/System/SysUserDetail/service/SysUserDetailService.java

@@ -1,7 +1,7 @@
-package com.ctsi.SysUserDetail.service;
+package com.ctsi.System.SysUserDetail.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
 
  /**
  * 用户信息表;(sys_user_detail)表服务接口

application/src/main/java/com/ctsi/SysUserDetail/service/impl/SysUserDetailServiceImpl.java → application/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.SysUserDetail.service.impl;
+package com.ctsi.System.SysUserDetail.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.SysUserDetail.mapper.SysUserDetailMapper;
-import com.ctsi.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper;
+import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  /**
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
  * @date : 2024-1-10
  */
 @Service
-public class SysUserDetailServiceImpl implements SysUserDetailService{
+public class SysUserDetailServiceImpl implements SysUserDetailService {
     @Autowired
     private SysUserDetailMapper sysUserDetailMapper;
     

application/src/main/java/com/ctsi/SysUserOrg/controller/SysUserOrgController.java → application/src/main/java/com/ctsi/System/SysUserOrg/controller/SysUserOrgController.java

@@ -1,15 +1,14 @@
-package com.ctsi.SysUserOrg.controller;
+package com.ctsi.System.SysUserOrg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.SysUserOrg.service.SysUserOrgService;
 
 import javax.annotation.Resource;
 

application/src/main/java/com/ctsi/SysUserOrg/entity/SysUserOrg.java → application/src/main/java/com/ctsi/System/SysUserOrg/entity/SysUserOrg.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserOrg.entity;
+package com.ctsi.System.SysUserOrg.entity;
 
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -24,9 +24,11 @@ public class SysUserOrg implements Serializable,Cloneable{
     private Long id ;
     /** 用户id */
     @ApiModelProperty(value = "用户id",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long userId ;
     /** 部门id */
     @ApiModelProperty(value = "部门id",notes = "")
+    @JsonSerialize(using = LongtoStringSerialize.class)
     private Long orgId ;
 
     /** 主键id */

application/src/main/java/com/ctsi/SysUserOrg/mapper/SysUserOrgMapper.java → application/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.java

@@ -1,14 +1,14 @@
-package com.ctsi.SysUserOrg.mapper;
+package com.ctsi.System.SysUserOrg.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
 
- /**
+/**
  * 用户部门表;(sys_user_org)表数据库访问层
  * @author : machaoyi
  * @date : 2024-1-11

application/src/main/java/com/ctsi/SysUserOrg/mapper/SysUserOrgMapper.xml → application/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysUserOrg.mapper.SysUserOrgMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysUserOrg.entity.SysUserOrg">
+<mapper namespace="com.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysUserOrg.entity.SysUserOrg">
         select * from sys_user_org ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysUserOrg/service/SysUserOrgService.java → application/src/main/java/com/ctsi/System/SysUserOrg/service/SysUserOrgService.java

@@ -1,9 +1,9 @@
-package com.ctsi.SysUserOrg.service;
+package com.ctsi.System.SysUserOrg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
 
- /**
+/**
  * 用户部门表;(sys_user_org)表服务接口
  * @author : machaoyi
  * @date : 2024-1-11

application/src/main/java/com/ctsi/SysUserOrg/service/impl/SysUserOrgServiceImpl.java → application/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java

@@ -1,15 +1,14 @@
-package com.ctsi.SysUserOrg.service.impl;
+package com.ctsi.System.SysUserOrg.service.impl;
 
-import cn.hutool.core.util.StrUtil;
+import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.ctsi.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.SysUserOrg.mapper.SysUserOrgMapper;
-import com.ctsi.SysUserOrg.service.SysUserOrgService;
+import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
  /**
  * 用户部门表;(sys_user_org)表服务实现类
  * @author : machaoyi

application/src/main/java/com/ctsi/SysUserRole/controller/SysUserRoleController.java → application/src/main/java/com/ctsi/System/SysUserRole/controller/SysUserRoleController.java

@@ -1,8 +1,8 @@
-package com.ctsi.SysUserRole.controller;
+package com.ctsi.System.SysUserRole.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.service.SysUserRoleService;
+import com.ctsi.System.SysUserRole.entity.SysUserRole;
+import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;

application/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRoleAddPO.java

@@ -0,0 +1,52 @@
+package com.ctsi.System.SysUserRole.entity.PO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+* 用户角色表;
+* @author : machaoyi
+* @date : 2024-1-11
+*/
+@ApiModel(value = "用户角色表新增PO",description = "")
+@TableName("sys_user_role")
+public class SysUserRoleAddPO implements Serializable,Cloneable{
+   /** 用户id */
+   @ApiModelProperty(value = "用户id",notes = "")
+   private Long userId ;
+   /** 角色id */
+   @ApiModelProperty(value = "角色id",notes = "")
+   private List<String> roleId ;
+   /** 角色名称 */
+   @ApiModelProperty(value = "角色名称",notes = "")
+   private List<String> roleName ;
+
+   /** 用户id */
+   public Long getUserId(){
+       return this.userId;
+   }
+   /** 用户id */
+   public void setUserId(Long userId){
+       this.userId=userId;
+   }
+
+   public List<String> getRoleId() {
+      return roleId;
+   }
+
+   public void setRoleId(List<String> roleId) {
+      this.roleId = roleId;
+   }
+
+   public List<String> getRoleName() {
+      return roleName;
+   }
+
+   public void setRoleName(List<String> roleName) {
+      this.roleName = roleName;
+   }
+}

application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRolePO.java → application/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRolePO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserRole.entity;
+package com.ctsi.System.SysUserRole.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRole.java → application/src/main/java/com/ctsi/System/SysUserRole/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserRole.entity;
+package com.ctsi.System.SysUserRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java → application/src/main/java/com/ctsi/System/SysUserRole/entity/VO/SysUserRoleAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.SysUserRole.entity;
+package com.ctsi.System.SysUserRole.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java → application/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.java

@@ -1,10 +1,9 @@
-package com.ctsi.SysUserRole.mapper;
+package com.ctsi.System.SysUserRole.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.SysUserRole.entity.SysUserRole;
+import com.ctsi.System.SysUserRole.entity.SysUserRole;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.xml → application/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.SysUserRole.mapper.SysUserRoleMapper">
-     <select id="selectByPage" resultType="com.ctsi.SysUserRole.entity.SysUserRole">
+<mapper namespace="com.ctsi.System.SysUserRole.mapper.SysUserRoleMapper">
+     <select id="selectByPage" resultType="com.ctsi.System.SysUserRole.entity.SysUserRole">
         select * from sys_user_role ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java → application/src/main/java/com/ctsi/System/SysUserRole/service/SysUserRoleService.java

@@ -1,8 +1,9 @@
-package com.ctsi.SysUserRole.service;
+package com.ctsi.System.SysUserRole.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
+import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
+import com.ctsi.System.SysUserRole.entity.SysUserRole;
+import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
 
 /**
  * 用户角色表;(sys_user_role)表服务接口
@@ -52,5 +53,5 @@ public interface SysUserRoleService{
 
     SysUserRoleAddVO save(SysUserRoleAddVO sysUserRoleAddVO);
 
-    SysUserRoleAddVO getUserRoles(Long id);
+    SysUserRoleAddPO getUserRoles(Long id);
 }

application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java → application/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -1,16 +1,16 @@
-package com.ctsi.SysUserRole.service.impl;
+package com.ctsi.System.SysUserRole.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.SysRole.entity.SysRole;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
-import com.ctsi.SysUserRole.entity.SysUserRolePO;
-import com.ctsi.SysUserRole.mapper.SysUserRoleMapper;
-import com.ctsi.SysUserRole.service.SysUserRoleService;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.ctsi.System.SysRole.entity.SysRole;
+import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
+import com.ctsi.System.SysUserRole.entity.SysUserRole;
+import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
+import com.ctsi.System.SysUserRole.entity.PO.SysUserRolePO;
+import com.ctsi.System.SysUserRole.mapper.SysUserRoleMapper;
+import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.List;
  * @date : 2024-1-11
  */
 @Service
-public class SysUserRoleServiceImpl implements SysUserRoleService{
+public class SysUserRoleServiceImpl implements SysUserRoleService {
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
     
@@ -126,23 +126,23 @@ public class SysUserRoleServiceImpl implements SysUserRoleService{
       * @param id userid
       * @return 实例对象
       */
-     public SysUserRoleAddVO getUserRoles(Long id){
+     public SysUserRoleAddPO getUserRoles(Long id){
          MPJLambdaWrapper<SysUserRole> queryWrapper = new MPJLambdaWrapper<>();
          queryWrapper.eq(SysUserRole::getUserId,id);
          queryWrapper.leftJoin(SysRole.class,SysRole::getId,SysUserRole::getRoleId);
          queryWrapper.selectAll(SysUserRole.class);
          queryWrapper.select(SysRole::getRoleName);
          List<SysUserRolePO> sysUserRoleList = sysUserRoleMapper.selectJoinList(SysUserRolePO.class,queryWrapper);
-         SysUserRoleAddVO sysUserRoleAddVO = new SysUserRoleAddVO();
-         sysUserRoleAddVO.setUserId(id);
-         List<Long> roleId = new ArrayList<>();
+         SysUserRoleAddPO sysUserRoleAddPO = new SysUserRoleAddPO();
+         sysUserRoleAddPO.setUserId(id);
+         List<String> roleId = new ArrayList<>();
          List<String> roleName = new ArrayList<>();
          for (SysUserRolePO sysUserRole : sysUserRoleList) {
-             roleId.add(sysUserRole.getRoleId());
+             roleId.add(sysUserRole.getRoleId().toString());
              roleName.add(sysUserRole.getRoleName());
          }
-         sysUserRoleAddVO.setRoleId(roleId);
-         sysUserRoleAddVO.setRoleName(roleName);
-         return sysUserRoleAddVO;
+         sysUserRoleAddPO.setRoleId(roleId);
+         sysUserRoleAddPO.setRoleName(roleName);
+         return sysUserRoleAddPO;
      }
 }