关系表加系统ID

authorize-api-service/src/main/java/com/xy/entity/SysDeptRelation.java

@@ -26,5 +26,9 @@ public class SysDeptRelation extends Model<SysDeptRelation> {
      * 后代节点
      */
     private Long descendant;
+    /**
+     * 系统ID
+     */
+    private Long sysId;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysDeptRole.java

@@ -28,6 +28,8 @@ public class SysDeptRole extends Model<SysDeptRole> {
 
     @ApiModelProperty("角色id")
     private Long roleId;
-
+    
+    @ApiModelProperty("系统ID")
+    private Long sysId;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysRoleMenu.java

@@ -34,4 +34,8 @@ public class SysRoleMenu extends BaseEntity<SysRoleMenu> {
      * 管理员数据查询权限
      */
     private Boolean selectIsAdmin;
+    /**
+     * 系统ID
+     */
+    private Long sysId;
 }

authorize-api-service/src/main/java/com/xy/service/SysDeptRelationService.java

@@ -33,4 +33,11 @@ public interface SysDeptRelationService extends IService<SysDeptRelation> {
      */
     void updateDeptRelation(SysDeptRelation relation);
 
+    /**
+     * 根据系统ID删除关系表
+     *
+     * @param sysId
+     */
+    void removeBySysId(Long sysId);
+
 }

authorize-api-service/src/main/java/com/xy/service/SysRoleMenuService.java

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xy.entity.SysRoleMenu;
+import com.xy.vo.RoleMenuVo;
 
 import java.util.List;
 
@@ -15,11 +16,10 @@ public interface SysRoleMenuService extends IService<SysRoleMenu> {
     /**
      * 更新角色菜单权限
      *
-     * @param roleId
-     * @param menuIds
+     * @param roleMenuVo
      * @return
      */
-    Boolean saveRoleMenus(Long roleId, List<Long> menuIds);
+    Boolean saveRoleMenus(RoleMenuVo roleMenuVo);
 
     /**
      * 查询角色菜单

authorize-api-service/src/main/java/com/xy/service/impl/SysDeptRelationServiceImpl.java

@@ -49,6 +49,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl<SysDeptRelationMappe
         SysDeptRelation own = new SysDeptRelation();
         own.setDescendant(sysDept.getId());
         own.setAncestor(sysDept.getId());
+        own.setSysId(sysDept.getSysId());
         sysDeptRelationMapper.insert(own);
     }
 
@@ -74,4 +75,14 @@ public class SysDeptRelationServiceImpl extends ServiceImpl<SysDeptRelationMappe
         baseMapper.insertDeptRelations(relation);
     }
 
+    /**
+     * 根据系统ID删除关系表
+     *
+     * @param sysId
+     */
+    @Override
+    public void removeBySysId(Long sysId) {
+        baseMapper.delete(Wrappers.<SysDeptRelation>lambdaQuery().eq(SysDeptRelation::getSysId, sysId));
+    }
+
 }

authorize-api-service/src/main/java/com/xy/service/impl/SysRoleMenuServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.entity.SysRoleMenu;
 import com.xy.mapper.SysRoleMenuMapper;
 import com.xy.service.SysRoleMenuService;
+import com.xy.vo.RoleMenuVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,13 +24,15 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
     /**
      * 更新角色菜单权限
      *
-     * @param roleId
-     * @param menuIds
+     * @param roleMenuVo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean saveRoleMenus(Long roleId, List<Long> menuIds) {
+    public Boolean saveRoleMenus(RoleMenuVo roleMenuVo) {
+        Long roleId = roleMenuVo.getId();
+        List<Long> menuIds = roleMenuVo.getMenuIds();
+        Long sysId = roleMenuVo.getSysId();
         //移除旧的权限
         remove(Wrappers.<SysRoleMenu>query().lambda().eq(SysRoleMenu::getRoleId, roleId));
 
@@ -41,6 +44,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
             SysRoleMenu roleMenu = new SysRoleMenu();
             roleMenu.setRoleId(roleId);
             roleMenu.setMenuId(menuId);
+            roleMenu.setSysId(sysId);
             return roleMenu;
         }).collect(Collectors.toList());
         //批量保存

authorize-api-service/src/main/java/com/xy/service/impl/SysRoleServiceImpl.java

@@ -100,7 +100,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public R<Boolean> saveRoleMenus(RoleMenuVo roleMenuVo) {
-        return R.ok(sysRoleMenuService.saveRoleMenus(roleMenuVo.getId(), roleMenuVo.getMenuIds()));
+        return R.ok(sysRoleMenuService.saveRoleMenus(roleMenuVo);
     }
 
     @Override

authorize-api/src/main/java/com/xy/vo/RoleMenuVo.java

@@ -18,4 +18,7 @@ public class RoleMenuVo {
     @ApiModelProperty("菜单")
     private List<Long> menuIds;
 
+    @ApiModelProperty("系统ID")
+    private Long sysId;
+
 }