From 4ca9ba747766ba75b6a90c59e964df44e3702e9f Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Tue, 12 Sep 2023 17:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=87=8F=E5=B0=91=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsStandardCollectionController.java     |  3 +++
 .../entity/LawsStandardCollection.java        |  4 +++
 .../LawsStandardCollectionServiceImpl.java    | 26 +++----------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
index 7a828f1b..17c1ea81 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
@@ -53,6 +53,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	@ApiOperation(value="标准收藏-国内收藏", notes="标准收藏-国内收藏")
 	@PostMapping(value = "/domestic/add")
 	public Result<T> domesticAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		lawsStandardCollection.setSource("1");
 		lawsStandardCollectionService.add(lawsStandardCollection);
 		return Result.OK("操作成功!");
 	}
@@ -78,6 +79,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @ApiOperation(value="标准收藏-海外收藏", notes="标准收藏-海外收藏")
 	 @PostMapping(value = "/overseas/add")
 	 public Result<T> overseasAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		 lawsStandardCollection.setSource("2");
 		 lawsStandardCollectionService.add(lawsStandardCollection);
 		 return Result.OK("操作成功!");
 	 }
@@ -103,6 +105,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏")
 	 @PostMapping(value = "/enterprise/add")
 	 public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		 lawsStandardCollection.setSource("3");
 		 lawsStandardCollectionService.add(lawsStandardCollection);
 		 return Result.OK("操作成功!");
 	 }
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
index dcc70fe8..9f30dc82 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * @Description: 标准收藏
@@ -44,6 +46,7 @@ public class LawsStandardCollection implements Serializable {
 
 	/**标准ID*/
     @ApiModelProperty(value = "标准ID")
+    @NotBlank(message = "standardId not null")
     private String standardId;
 
     /**标准类别(GB、GB/T)*/
@@ -52,6 +55,7 @@ public class LawsStandardCollection implements Serializable {
 
     /**标准编号*/
     @ApiModelProperty(value = "标准编号")
+    @NotBlank(message = "standardNumber not null")
     private String standardNumber;
 
     /**标准名称*/
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
index c23d1db5..2934f86c 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
@@ -5,6 +5,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.laws.common.service.ILawsCommonService;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
 import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.personal.entity.LawsStandardCollection;
@@ -94,28 +95,9 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 	 */
 	@Override
     public void add(LawsStandardCollection lawsStandardCollection) {
-		//下面这些判断是给前端联调时给前端看的
-		String standardClass = lawsStandardCollection.getStandardClass();
-		if (StringUtils.isBlank(standardClass)){
-			throw new JeroBootException("standardClass标准类别参数不能为空");
-		}
-		String standardNumber = lawsStandardCollection.getStandardNumber();
-		if (StringUtils.isBlank(standardNumber)){
-			throw new JeroBootException("standardNumber标准编号参数不能为空");
-		}
-		String standardName = lawsStandardCollection.getStandardName();
-		if (StringUtils.isBlank(standardName)){
-			throw new JeroBootException("standardName标准名称参数不能为空");
-		}
-		String source1 = lawsStandardCollection.getSource();
-		if (StringUtils.isBlank(source1)){
-			throw new JeroBootException("source1收藏标准来源(1国内、2海外、3企标)参数不能为空");
-		}
-		String collectionStandardId = lawsStandardCollection.getStandardId();
-		if (StringUtils.isBlank(collectionStandardId)){
-			throw new JeroBootException("standardId标准ID(参数不能为空");
-		}
-
+		LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardCollection.getStandardId());
+		lawsStandardCollection.setStandardClass(standard.getStandardClass());
+		lawsStandardCollection.setStandardName(standard.getStandardName());
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		lawsStandardCollection.setCollectorId(sysUser.getId());
 		Date now = new Date();