系统菜单调整

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysDeptController.java

@@ -1,6 +1,9 @@
 package com.hr.system.controller;
 
 import java.util.List;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -28,6 +31,7 @@ import com.hr.system.service.ISysDeptService;
  * 
  * @author ruoyi
  */
+@Tag(name = "统一权限组织机构管理", description = "组织机构相关的API操作")
 @RestController
 @RequestMapping("/dept")
 public class SysDeptController extends BaseController
@@ -38,6 +42,9 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
+    @Operation(
+            summary = "获取组织列表"
+    )
     @RequiresPermissions("system:dept:list")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
@@ -61,6 +68,9 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
+    @Operation(
+            summary = "根据部门编号获取详细信息"
+    )
     @RequiresPermissions("system:dept:query")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
@@ -72,6 +82,9 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
+    @Operation(
+            summary = "新增部门"
+    )
     @RequiresPermissions("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -91,6 +104,9 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
+    @Operation(
+            summary = "修改部门"
+    )
     @RequiresPermissions("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -117,6 +133,9 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
+    @Operation(
+            summary = "删除部门"
+    )
     @RequiresPermissions("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysDictDataController.java

@@ -3,6 +3,9 @@ package com.hr.system.controller;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -31,6 +34,7 @@ import com.hr.system.service.ISysDictTypeService;
  * 
  * @author ruoyi
  */
+@Tag(name = "统一权限字典管理", description = "字典相关的API操作")
 @RestController
 @RequestMapping("/dict/data")
 public class SysDictDataController extends BaseController
@@ -41,6 +45,9 @@ public class SysDictDataController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
+    @Operation(
+            summary = "获取字典列表"
+    )
     @RequiresPermissions("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
@@ -50,6 +57,9 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
     }
 
+    @Operation(
+            summary = "字典数据"
+    )
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:dict:export")
     @PostMapping("/export")
@@ -63,6 +73,9 @@ public class SysDictDataController extends BaseController
     /**
      * 查询字典数据详细
      */
+    @Operation(
+            summary = "查询字典数据详细"
+    )
     @RequiresPermissions("system:dict:query")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode)
@@ -73,6 +86,9 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
+    @Operation(
+            summary = "根据字典类型查询字典数据信息"
+    )
     @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     {
@@ -87,6 +103,9 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
+    @Operation(
+            summary = "新增字典类型"
+    )
     @RequiresPermissions("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
@@ -99,6 +118,9 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
+    @Operation(
+            summary = "修改保存字典类型"
+    )
     @RequiresPermissions("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -111,6 +133,9 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
+    @Operation(
+            summary = "删除字典类型"
+    )
     @RequiresPermissions("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysMenuController.java

@@ -1,6 +1,9 @@
 package com.hr.system.controller;
 
 import java.util.List;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,6 +30,7 @@ import com.hr.system.service.ISysMenuService;
  * 
  * @author ruoyi
  */
+@Tag(name = "统一权限菜单管理", description = "菜单相关的API操作")
 @RestController
 @RequestMapping("/menu")
 public class SysMenuController extends BaseController
@@ -37,6 +41,9 @@ public class SysMenuController extends BaseController
     /**
      * 获取菜单列表
      */
+    @Operation(
+            summary = "获取菜单列表"
+    )
     @RequiresPermissions("system:menu:list")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)
@@ -49,6 +56,9 @@ public class SysMenuController extends BaseController
     /**
      * 根据菜单编号获取详细信息
      */
+    @Operation(
+            summary = "根据菜单编号获取详细信息"
+    )
     @RequiresPermissions("system:menu:query")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId)
@@ -59,6 +69,9 @@ public class SysMenuController extends BaseController
     /**
      * 获取菜单下拉树列表
      */
+    @Operation(
+            summary = "获取菜单下拉树列表"
+    )
     @GetMapping("/treeselect")
     public AjaxResult treeselect(SysMenu menu)
     {
@@ -70,6 +83,9 @@ public class SysMenuController extends BaseController
     /**
      * 加载对应角色菜单列表树
      */
+    @Operation(
+            summary = "加载对应角色菜单列表树"
+    )
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
@@ -84,6 +100,9 @@ public class SysMenuController extends BaseController
     /**
      * 新增菜单
      */
+    @Operation(
+            summary = "新增菜单"
+    )
     @RequiresPermissions("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -107,6 +126,9 @@ public class SysMenuController extends BaseController
     /**
      * 修改菜单
      */
+    @Operation(
+            summary = "修改菜单"
+    )
     @RequiresPermissions("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -136,6 +158,9 @@ public class SysMenuController extends BaseController
     /**
      * 删除菜单
      */
+    @Operation(
+            summary = "删除菜单"
+    )
     @RequiresPermissions("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
@@ -157,11 +182,14 @@ public class SysMenuController extends BaseController
      * 
      * @return 路由信息
      */
-    @GetMapping("getRouters")
-    public AjaxResult getRouters()
+    @Operation(
+            summary = "获取路由信息"
+    )
+    @GetMapping("getRouters/{systemcode}")
+    public AjaxResult getRouters(@PathVariable("systemcode") String systemcode)
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId,systemcode);
         return success(menuService.buildMenus(menus));
     }
 }

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysRoleController.java

@@ -2,6 +2,9 @@ package com.hr.system.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -33,6 +36,7 @@ import com.hr.system.service.ISysUserService;
  * 
  * @author ruoyi
  */
+@Tag(name = "统一权限角色管理", description = "角色相关的API操作")
 @RestController
 @RequestMapping("/role")
 public class SysRoleController extends BaseController
@@ -46,6 +50,9 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Operation(
+            summary = "查询角色"
+    )
     @RequiresPermissions("system:role:list")
     @PostMapping("/list")
     public TableDataInfo list(SysRole role)
@@ -68,6 +75,10 @@ public class SysRoleController extends BaseController
         util.exportExcel(response, list, "角色数据");
     }
 
+
+    @Operation(
+            summary = "根据角色编号获取详细信息"
+    )
     /**
      * 根据角色编号获取详细信息
      */
@@ -79,9 +90,13 @@ public class SysRoleController extends BaseController
         return success(roleService.selectRoleById(roleId));
     }
 
+
     /**
      * 新增角色
      */
+    @Operation(
+            summary = "新增角色"
+    )
     @RequiresPermissions("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -95,6 +110,10 @@ public class SysRoleController extends BaseController
         {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
+        if(role.getDeptId()==null || role.getDeptId()==0){
+            return error("新增角色'" + role.getRoleName() + "'失败，角色未绑定组织机构");
+        }
+
         role.setCreateBy(SecurityUtils.getUsername());
         return toAjax(roleService.insertRole(role));
 
@@ -103,6 +122,9 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
+    @Operation(
+            summary = "修改保存角色"
+    )
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +160,9 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
+    @Operation(
+            summary = "角色状态修改"
+    )
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -152,6 +177,9 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
+    @Operation(
+            summary = "删除角色"
+    )
     @RequiresPermissions("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
@@ -163,6 +191,9 @@ public class SysRoleController extends BaseController
     /**
      * 获取角色选择框列表
      */
+    @Operation(
+            summary = "获取角色选择框列表"
+    )
     @RequiresPermissions("system:role:query")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
@@ -230,6 +261,9 @@ public class SysRoleController extends BaseController
     /**
      * 获取对应角色部门树列表
      */
+    @Operation(
+            summary = "获取对应角色部门树列表"
+    )
     @RequiresPermissions("system:role:query")
     @GetMapping(value = "/deptTree/{roleId}")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysSystemController.java

@@ -11,6 +11,8 @@ import com.hr.common.log.annotation.Log;
 import com.hr.common.log.enums.BusinessType;
 import com.hr.common.security.annotation.RequiresPermissions;
 import com.hr.common.security.utils.SecurityUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -22,6 +24,7 @@ import java.util.List;
  * @author yaoy
  * @createTime 2025/9/26 10:53
  **/
+@Tag(name = "统一权限系统管理", description = "系统相关的API操作")
 @RestController
 @RequestMapping("/businessSystem")
 public class SysSystemController extends BaseController{
@@ -32,7 +35,9 @@ public class SysSystemController extends BaseController{
     /**
      * 获取部门列表
      */
-
+    @Operation(
+            summary = "系统列表"
+    )
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -45,6 +50,9 @@ public class SysSystemController extends BaseController{
      * 新增部门
      */
 //    @RequiresPermissions("system:dept:add")
+    @Operation(
+            summary = "新增系统"
+    )
     @Log(title = "业务系统管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysBusinessSystem dept)
@@ -56,6 +64,9 @@ public class SysSystemController extends BaseController{
      * 修改部门
      */
 //    @RequiresPermissions("system:dept:edit")
+    @Operation(
+            summary = "修改系统"
+    )
     @Log(title = "业务系统管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysBusinessSystem dept)
@@ -67,6 +78,9 @@ public class SysSystemController extends BaseController{
      * 删除部门
      */
 //    @RequiresPermissions("system:dept:remove")
+    @Operation(
+            summary = "删除系统"
+    )
     @Log(title = "业务系统管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{sysid}")
     public AjaxResult remove(@PathVariable Long sysid)

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysUserController.java

@@ -11,6 +11,8 @@ import com.hr.system.service.*;
 import com.hr.system.api.model.SysDeptDto;
 import com.hr.system.domain.SysMenu;
 import com.hr.system.domain.SysPost;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -45,6 +47,7 @@ import com.hr.system.api.model.LoginUser;
  * 
  * @author ruoyi
  */
+@Tag(name = "统一权限用户管理", description = "用户相关的API操作")
 @RestController
 @RequestMapping("/user")
 public class SysUserController extends BaseController
@@ -78,6 +81,9 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
+    @Operation(
+            summary = "获取用户列表"
+    )
     @RequiresPermissions("system:user:list")
     @PostMapping("/list")
     public TableDataInfo queryUserList(@RequestBody SysUser user)
@@ -110,6 +116,9 @@ public class SysUserController extends BaseController
     /**
      * 新增用户
      */
+    @Operation(
+            summary = "新增用户"
+    )
     @RequiresPermissions("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -145,6 +154,9 @@ public class SysUserController extends BaseController
     /**
      * 修改用户
      */
+    @Operation(
+            summary = "修改用户"
+    )
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -174,6 +186,9 @@ public class SysUserController extends BaseController
     /**
      * 删除用户
      */
+    @Operation(
+            summary = "删除用户"
+    )
     @RequiresPermissions("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
@@ -191,6 +206,9 @@ public class SysUserController extends BaseController
      *
      * @return 用户信息
      */
+    @Operation(
+            summary = "获取当前登录的用户信息"
+    )
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
@@ -228,6 +246,9 @@ public class SysUserController extends BaseController
     /**
      * 根据用户ID获取用户信息
      */
+    @Operation(
+            summary = "根据用户ID获取用户信息"
+    )
     @PostMapping("/getUserInfoById")
     public AjaxResult getUserInfoById(@RequestBody SysUser sysUser)
     {

hr-modules/hr-system/src/main/java/com/hr/system/domain/SysRoleMenu.java

@@ -16,6 +16,8 @@ public class SysRoleMenu
     /** 菜单ID */
     private Long menuId;
 
+    private String systemCode;
+
     public Long getRoleId()
     {
         return roleId;
@@ -36,11 +38,20 @@ public class SysRoleMenu
         this.menuId = menuId;
     }
 
+    public String getSystemCode() {
+        return systemCode;
+    }
+
+    public void setSystemCode(String systemCode) {
+        this.systemCode = systemCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("roleId", getRoleId())
             .append("menuId", getMenuId())
+                .append("systemCode", getSystemCode())
             .toString();
     }
 }

hr-modules/hr-system/src/main/java/com/hr/system/mapper/SysMenuMapper.java

@@ -63,7 +63,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(@Param("userId") Long userId,@Param("systemcode") String systemcode);
 
     /**
      * 根据用户ID查询菜单,包括按钮

hr-modules/hr-system/src/main/java/com/hr/system/mapper/SysRoleDeptMapper.java

@@ -10,6 +10,8 @@ import com.hr.system.domain.SysRoleDept;
  */
 public interface SysRoleDeptMapper
 {
+
+    public SysRoleDept selectRoleDep(Long roleId);
     /**
      * 通过角色ID删除角色和部门关联
      * 

hr-modules/hr-system/src/main/java/com/hr/system/mapper/SysUserDepMapper.java

@@ -11,6 +11,8 @@ import java.util.List;
  */
 public interface SysUserDepMapper
 {
+
+    SysUserDep selectUserDep(Long userId);
     /**
      * 通过用户ID删除用户和岗位关联
      * 

hr-modules/hr-system/src/main/java/com/hr/system/service/ISysMenuService.java

@@ -52,7 +52,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(Long userId,String systemcode);
 
     /**
      * 根据用户ID查询菜单树信息,包括按钮

hr-modules/hr-system/src/main/java/com/hr/system/service/impl/SysMenuServiceImpl.java

@@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeByUserId(Long userId,String systemcode)
     {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId))
@@ -137,7 +137,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
         else
         {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
+            menus = menuMapper.selectMenuTreeByUserId(userId,systemcode);
         }
         return getChildPerms(menus, 0);
     }

hr-modules/hr-system/src/main/java/com/hr/system/service/impl/SysRoleServiceImpl.java

@@ -44,6 +44,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     private SysRoleDeptMapper roleDeptMapper;
     @Autowired
     private SysDeptMapper sysDeptMapper;
+    @Autowired
+    private SysRoleDeptMapper sysRoleDeptMapper;
+
 
     /**
      * 根据条件分页查询角色数据
@@ -136,6 +139,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public SysRole selectRoleById(Long roleId)
     {
+
         return roleMapper.selectRoleById(roleId);
     }
 

hr-modules/hr-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -60,9 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</foreach>
 
 		</if>
-		<if test="deptType != null and deptType != '' ">
-			AND dep_type = #{deptType}
-		</if>
+
 
 		order by d.parent_id, d.order_num
 	</select>
@@ -85,9 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dept d
 		left join sys_role_dept rd on d.dept_id = rd.dept_id
 		where rd.role_id = #{roleId}
-		<if test="deptType != null ">
-			and d.dep_type=#{deptType}
-		</if>
+
 		<if test="deptCheckStrictly">
 			and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
 		</if>
@@ -99,9 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dept d
 		inner join sys_user_dep rd on d.dept_id = rd.dep_id
 		where rd.user_id = #{userId}
-		<if test="deptType != null ">
-			and d.dep_type=#{deptType}
-		</if>
+
 		order by d.parent_id, d.order_num
 	</select>
 
@@ -110,9 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dept d
 		inner join sys_user_dep rd on d.dept_id = rd.dep_id
 		where rd.user_id = #{userId}
-		<if test="deptType != null ">
-			and d.dep_type=#{deptType}
-		</if>
+
 		order by d.parent_id, d.order_num
 	</select>
 
@@ -152,8 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
  			<if test="orderNum != null">order_num,</if>
-			<if test="depType != null">dep_type,</if>
-			<if test="orgCode != null">org_code,</if>
+<!--			<if test="depType != null">dep_type,</if>-->
+<!--			<if test="orgCode != null">org_code,</if>-->
 
  			<if test="leader != null and leader != ''">leader,</if>
  			<if test="phone != null and phone != ''">phone,</if>
@@ -167,8 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
  			<if test="orderNum != null">#{orderNum},</if>
-			<if test="depType != null">#{depType},</if>
-			<if test="orgCode != null">#{orgCode},</if>
+<!--			<if test="depType != null">#{depType},</if>-->
+<!--			<if test="orgCode != null">#{orgCode},</if>-->
 
  			<if test="leader != null and leader != ''">#{leader},</if>
  			<if test="phone != null and phone != ''">#{phone},</if>
@@ -184,8 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
-			<if test="depType != null and depType != ''">dep_type = #{depType},</if>
-			<if test="orgCode != null and orgCode != ''">org_code = #{orgCode},</if>
+<!--			<if test="depType != null and depType != ''">dep_type = #{depType},</if>-->
+<!--			<if test="orgCode != null and orgCode != ''">org_code = #{orgCode},</if>-->
 
 
  			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>

hr-modules/hr-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -41,7 +41,7 @@
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="systemCode != null and systemCode != ''">
-				AND m.system_code = #{systemCode}
+				AND system_code = #{systemCode}
 			</if>
 			<if test="menuName != null and menuName != ''">
 				AND menu_name like concat('%', #{menuName}, '%')
@@ -91,7 +91,12 @@
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 			 left join sys_role ro on ur.role_id = ro.role_id
 			 left join sys_user u on ur.user_id = u.user_id
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
+		where u.user_id = #{userId}
+		<if test="systemcode != null and systemcode != ''">
+			AND system_code =#{systemcode}
+		</if>
+
+		  and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 
@@ -175,6 +180,8 @@
 			<if test="url != null and url != ''">url = #{url},</if>
 			<if test="urlmatch != null and urlmatch != ''">urlmatch = #{urlmatch},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
+
 			update_time = sysdate()
 		</set>
 		where menu_id = #{menuId}
@@ -185,6 +192,8 @@
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
+		<if test="systemCode != null and systemCode != ''">system_code,</if>
+
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
@@ -207,6 +216,8 @@
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
+		<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
+
 		<if test="orderNum != null">#{orderNum},</if>
 		<if test="path != null and path != ''">#{path},</if>
 		<if test="component != null and component != ''">#{component},</if>

hr-modules/hr-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -9,6 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="deptId"     column="dept_id"      />
 	</resultMap>
 
+	<select id="selectRoleDep" resultType="SysRoleDept">
+		select * from sys_role_dept where role_id=#{roleId} limit 1
+	</select>
+
 	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
 		delete from sys_role_dept where role_id=#{roleId}
 	</delete>

hr-modules/hr-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -27,16 +27,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key,r.role_urlmatch_key, r.role_sort, r.data_scope , r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark 
+            r.status, r.del_flag, r.create_time, r.remark ,r.dept_id
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
+
+	<sql id="selectRoleVo1">
+		select distinct r.role_id, r.role_name, r.role_key,r.role_urlmatch_key, r.role_sort, r.data_scope , r.menu_check_strictly, r.dept_check_strictly,
+						r.status, r.del_flag, r.create_time, r.remark,r.dept_id
+		from sys_role r
+
+	</sql>
     
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
+		<include refid="selectRoleVo1"/>
 		where r.del_flag = '0'
+		<if test="deptId != null and deptId != 0">
+			AND r.dept_id = #{deptId}
+		</if>
+
 		<if test="roleId != null and roleId != 0">
 			AND r.role_id = #{roleId}
 		</if>