1、角色绑定菜单、获取角色菜单

2、用户信息新增角色信息

.idea/workspace.xml

@@ -4,14 +4,36 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、获取用户当前角色">
+    <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" />
       <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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="ChangesViewManager">
+    <option name="groupingKeys">
+      <option value="directory" />
+    </option>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -87,10 +109,10 @@
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <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" />
-      <recent name="com.ctsi.user.entity" />
-      <recent name="com.ctsi.utils" />
     </key>
   </component>
   <component name="RunManager">
@@ -120,7 +142,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
-      <workItem from="1704932572547" duration="11003000" />
+      <workItem from="1704932572547" duration="24466000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -210,7 +232,31 @@
       <option name="project" value="LOCAL" />
       <updated>1704943380798</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="1、优化import">
+      <option name="closed" value="true" />
+      <created>1704954196144</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1704954196144</updated>
+    </task>
+    <task id="LOCAL-00013" summary="1、用户部门接口">
+      <option name="closed" value="true" />
+      <created>1705022170773</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1705022170773</updated>
+    </task>
+    <task id="LOCAL-00014" summary="1、新增、修改用户，关联角色表、部门表">
+      <option name="closed" value="true" />
+      <created>1705023054528</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1705023054528</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -229,7 +275,10 @@
     <MESSAGE value="1、用户角色表" />
     <MESSAGE value="1、用户绑定角色&#10;2、用户接口包修改" />
     <MESSAGE value="1、获取用户当前角色" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、获取用户当前角色" />
+    <MESSAGE value="1、优化import" />
+    <MESSAGE value="1、用户部门接口" />
+    <MESSAGE value="1、新增、修改用户，关联角色表、部门表" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、新增、修改用户，关联角色表、部门表" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />