增加来源

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysRoleController.java

@@ -217,7 +217,7 @@ public class SysRoleController  extends BaseServiceController {
 		if (!Optional.ofNullable(roleUpdateOrganizationDto.getRoleId()).isPresent() || CollectionUtils.isEmpty(roleUpdateOrganizationDto.getOrganizationCodes())) {
 			return ResultResp.NOTNULLPARAM();
 		}
-		boolean flag = permissionService.updateRoleOrganization(roleUpdateOrganizationDto.getRoleId(), roleUpdateOrganizationDto.getOrganizationCodes(),getUserId());
+		boolean flag = permissionService.updateRoleOrganization(roleUpdateOrganizationDto.getRoleId(), roleUpdateOrganizationDto.getOrganizationCodes(),getUserId(),1);
 		if (flag) {
 			return ResultResp.SUCCESS();
 		}

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -84,7 +84,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
         organizationCode.setCodeNumber(po.getCompanyCode());
         organizationCode.setCodeType(TypeRelationEnum.COMPANY_NUMBER.getCode());
         organizationCodes.add(organizationCode);
-        permissionService.updateRoleOrganization(roleId,organizationCodes,userId);
+        permissionService.updateRoleOrganization(roleId,organizationCodes,userId,0);
 
         return this.createWindRelation(dto, po);
     }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysPermissionService.java

@@ -30,6 +30,6 @@ public interface SysPermissionService extends BaseService<SysPermissionPO> {
 
     boolean updateRolePermission(Integer roleId, String permissionIds);
 
-    boolean updateRoleOrganization(Integer roleId, List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes,Integer userId);
+    boolean updateRoleOrganization(Integer roleId, List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes,Integer userId, int type);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysPermissionServiceImpl.java

@@ -148,13 +148,15 @@ public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermissionPO> i
 
 
     @Override
-    public boolean updateRoleOrganization(Integer roleId, List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes,Integer userId) {
+    public boolean updateRoleOrganization(Integer roleId, List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes, Integer userId, int type) {
         if (CollectionUtils.isEmpty(organizationCodes)) {
             return true;
         }
         SysOrganizationAuthPO po = new SysOrganizationAuthPO();
         po.setRoleId(roleId);
-        sysOrganizationAuthMapper.delete(po);
+        if (type > 0) {
+            sysOrganizationAuthMapper.delete(po);
+        }
         List<SysOrganizationAuthPO> dataList = new ArrayList<>(organizationCodes.size());
         for (RoleUpdateOrganizationDto.OrganizationCode item : organizationCodes) {
             SysOrganizationAuthPO sysOrganizationAuthPO = new SysOrganizationAuthPO();

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -136,7 +136,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         organizationCode.setCodeNumber(windFieldPO.getFieldCode());
         organizationCode.setCodeType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
         organizationCodes.add(organizationCode);
-        permissionService.updateRoleOrganization(roleId, organizationCodes, userId);
+        permissionService.updateRoleOrganization(roleId, organizationCodes, userId,0);
 
         return createWindRelation(windFieldPO);
     }
@@ -230,7 +230,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             organizationCode.setCodeType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
             organizationCodes.add(organizationCode);
         }
-        permissionService.updateRoleOrganization(roleId, organizationCodes, userId);
+        permissionService.updateRoleOrganization(roleId, organizationCodes, userId,0);
 
         return bathCreateWindRelation(list) ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }