Browse Source

#FIX 修复部门角色关系,系统id为空问题

谭斌 2 năm trước cách đây
mục cha
commit
adfb03c5f6

+ 2 - 2
authorize-api-service/src/main/java/com/xy/service/SysDeptRoleService.java

@@ -21,7 +21,7 @@ public interface SysDeptRoleService extends IService<SysDeptRole> {
      * @author 谭斌
      * @date 2022/12/15 10:47
      */
-    void saveDeptRole(Long deptId, List<Long> roleIds);
+    void saveDeptRole(Long deptId, List<Long> roleIds, Long sysId);
 
     /***
      * 更新部门角色关系
@@ -29,7 +29,7 @@ public interface SysDeptRoleService extends IService<SysDeptRole> {
      * @author 谭斌
      * @date 2022/12/15 10:47
      */
-    void updateDeptRole(Long deptId, List<Long> roleIds);
+    void updateDeptRole(Long deptId, List<Long> roleIds, Long sysId);
 
     /**
      * 通过部门ID删除部门角色关系

+ 4 - 4
authorize-api-service/src/main/java/com/xy/service/impl/SysDeptRoleServiceImpl.java

@@ -23,16 +23,16 @@ import java.util.stream.Collectors;
 public class SysDeptRoleServiceImpl extends ServiceImpl<SysDeptRoleMapper, SysDeptRole> implements SysDeptRoleService {
 
     @Override
-    public void saveDeptRole(Long deptId, List<Long> roleIds) {
-        List<SysDeptRole> sysDeptRoles = roleIds.stream().map(roleId -> new SysDeptRole().setDeptId(deptId).setRoleId(roleId)).collect(Collectors.toList());
+    public void saveDeptRole(Long deptId, List<Long> roleIds, Long sysId) {
+        List<SysDeptRole> sysDeptRoles = roleIds.stream().map(roleId -> new SysDeptRole().setSysId(sysId).setDeptId(deptId).setRoleId(roleId)).collect(Collectors.toList());
         saveBatch(sysDeptRoles);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateDeptRole(Long deptId, List<Long> roleIds) {
+    public void updateDeptRole(Long deptId, List<Long> roleIds, Long sysId) {
         removeDeptRoleById(deptId);
-        saveDeptRole(deptId, roleIds);
+        saveDeptRole(deptId, roleIds, sysId);
     }
 
     @Override

+ 2 - 2
authorize-api-service/src/main/java/com/xy/service/impl/SysDeptServiceImpl.java

@@ -83,7 +83,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             sysDeptRelationService.saveDeptRelation(sysDept);
             //角色部门关系建立
             if (CollUtil.isNotEmpty(roleIds)) {
-                sysDeptRoleService.saveDeptRole(sysDept.getId(), roleIds);
+                sysDeptRoleService.saveDeptRole(sysDept.getId(), roleIds, sysDeptDto.getSysId());
             }
         } else {
             // 更新部门关系
@@ -93,7 +93,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             sysDeptRelationService.updateDeptRelation(relation);
             //角色部门关系更新
             if (CollUtil.isNotEmpty(roleIds)) {
-                sysDeptRoleService.updateDeptRole(sysDept.getId(), roleIds);
+                sysDeptRoleService.updateDeptRole(sysDept.getId(), roleIds, sysDeptDto.getSysId());
             }
         }
         return R.ok(saveOrUpdate(sysDept));