修改数据权限新增修改方法

common/src/main/java/com/lantone/common/vo/AddAuthSoftwareVO.java

@@ -24,4 +24,8 @@ public class AddAuthSoftwareVO implements Serializable {
     @Valid
     @NotNull(message = "数据权限详情列表为空")
     private List<DataAuthDetailVO> dataAuthDetails;
+
+    @ApiModelProperty(value = "角色列表", required = true)
+    @NotEmpty(message = "角色列表为空")
+    private List<Long> roles;
 }

common/src/main/java/com/lantone/common/vo/AddAuthVO.java

@@ -21,8 +21,4 @@ public class AddAuthVO {
     @Valid
     @NotNull(message = "数据权限对象为空")
     private AddDataAuthVO addDataAuthVO;
-
-    @ApiModelProperty(value = "角色列表", required = true)
-    @NotEmpty(message = "角色列表为空")
-    private List<Long> roles;
 }

security-center/src/main/java/com/lantone/security/facade/DataAuthManagementFacade.java

@@ -130,7 +130,7 @@ public class DataAuthManagementFacade {
                 }
             }
             //4.插入新建数据权限与系统的关系
-            return saveServiceDataAuth(updateAuthVO.getUpdateDataAuthVO().getSoftwareVOS(), updateAuthVO.getRoles(), updateAuthVO.getUpdateDataAuthVO().getId());
+            return saveServiceDataAuth(updateAuthVO.getUpdateDataAuthVO().getSoftwareVOS(), updateAuthVO.getUpdateDataAuthVO().getId());
         } else {
             Asserts.fail("数据权限修改失败");
         }
@@ -204,7 +204,7 @@ public class DataAuthManagementFacade {
         dataAuth.setCreator(SysUserUtils.getCurrentPrincipleId() + "");
         if (dataAuthFacade.save(dataAuth)) {
             //2.插入新建数据权限与系统的关系 sys_software_data_auth
-            return saveServiceDataAuth(addAuthVO.getAddDataAuthVO().getSoftwareVOS(), addAuthVO.getRoles(), dataAuth.getId());
+            return saveServiceDataAuth(addAuthVO.getAddDataAuthVO().getSoftwareVOS(), dataAuth.getId());
         } else {
             Asserts.fail("数据权限插入失败");
         }
@@ -214,12 +214,11 @@ public class DataAuthManagementFacade {
 
     /**
      * @param softwareVOS
-     * @param roles
      * @param dataAuthId
      * @Description插入新建数据权限与系统的关系
      * @Return void
      */
-    private boolean saveServiceDataAuth(List<AddAuthSoftwareVO> softwareVOS, List<Long> roles, Long dataAuthId) {
+    private boolean saveServiceDataAuth(List<AddAuthSoftwareVO> softwareVOS, Long dataAuthId) {
         AtomicBoolean out = new AtomicBoolean(false);
         softwareVOS.stream().forEach(softwareVO -> {
             SoftwareDataAuth softwareDataAuth = new SoftwareDataAuth();
@@ -230,7 +229,7 @@ public class DataAuthManagementFacade {
             if (softwareDataAuthFacade.save(softwareDataAuth)) {
                 //2.插入数据权限系统关联表与角色管理sys_role_service_data_auth
                 List<RoleSoftwareDataAuth> roleSoftwareDataAuths = new ArrayList<>();
-                for (Long roleId : roles) {
+                for (Long roleId : softwareVO.getRoles()) {
                     RoleSoftwareDataAuth roleServiceDataAuth = new RoleSoftwareDataAuth();
                     roleServiceDataAuth.setRoleId(roleId);
                     roleServiceDataAuth.setSoftwareDataAuthId(softwareDataAuth.getId());