diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java index 45020916..b9f15249 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java @@ -28,8 +28,8 @@ public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl esAuthDepts = new ArrayList<>(); - for (String standardNo : standardTempPermission.getStandardNos()) { - for (String deptId : standardTempPermission.getDeptIds()) { + for (String standardNo : standardTempPermission.getStandardNoList()) { + for (String deptId : standardTempPermission.getDeptIdList()) { EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept(); enterpriseStandardAuthDept.setAuthDept(deptId); enterpriseStandardAuthDept.setStandardNo(standardNo); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index b1a9bf29..89e1545f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -26,8 +26,8 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl esAuthUsers = new ArrayList<>(); - for (String standardNo : standardTempPermission.getStandardNos()) { - for (String userId : standardTempPermission.getUserIds()) { + for (String standardNo : standardTempPermission.getStandardNoList()) { + for (String userId : standardTempPermission.getUserIdList()) { EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser(); enterpriseStandardAuthUser.setAuthUser(userId); enterpriseStandardAuthUser.setStandardNo(standardNo); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java index 6f41ad1c..f7c53d2f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java @@ -8,9 +8,12 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author: Mzaxd @@ -22,19 +25,40 @@ import java.util.List; @Accessors(chain = true) public class StandardTempPermission { - @NotNull + @NotBlank @ApiModelProperty(value = "标准标号") - List standardNos; + String standardNos; + List standardNoList; @ApiModelProperty(value = "部门Ids") - List deptIds; + String deptIds; + List deptIdList; @ApiModelProperty(value = "用户Ids") - List userIds; + String userIds; + List userIdList; /**授权到期日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "授权到期日期") Date authDate; + + public void setStandardNos(String standardNos) { + this.standardNos = standardNos; + this.standardNoList = + Arrays.stream(standardNos.split(",")).map(String::trim).collect(Collectors.toList()); + } + + public void setDeptIds(String deptIds) { + this.deptIds = deptIds; + this.deptIdList = + Arrays.stream(deptIds.split(",")).map(String::trim).collect(Collectors.toList()); + } + + public void setUserIds(String userIds) { + this.userIds = userIds; + this.userIdList = + Arrays.stream(userIds.split(",")).map(String::trim).collect(Collectors.toList()); + } }