From f594eff80971b9aabb875911988a13c214d56b70 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 15 Sep 2023 14:33:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=80=97=E5=8F=B7=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...EnterpriseStandardAuthDeptServiceImpl.java |  4 +--
 ...EnterpriseStandardAuthUserServiceImpl.java |  4 +--
 .../entity/StandardTempPermission.java        | 32 ++++++++++++++++---
 3 files changed, 32 insertions(+), 8 deletions(-)

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<Enterpris
     @Override
     public void saveTempPermission(StandardTempPermission standardTempPermission) {
         List<EnterpriseStandardAuthDept> 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<Enterpris
     @Override
     public void saveTempPermission(StandardTempPermission standardTempPermission) {
         List<EnterpriseStandardAuthUser> 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<String> standardNos;
+    String standardNos;
+    List<String> standardNoList;
 
     @ApiModelProperty(value = "部门Ids")
-    List<String> deptIds;
+    String deptIds;
+    List<String> deptIdList;
 
     @ApiModelProperty(value = "用户Ids")
-    List<String> userIds;
+    String userIds;
+    List<String> 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());
+    }
 }