From 5fc75448db059f322f018a74b69c55521e25c40d Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 24 May 2022 14:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A7=94=E6=89=98=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95=E5=AD=97=E7=AC=A6=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=90=8D=E7=A7=B0=E5=92=8C=E7=BC=96=E5=8F=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/project/checkSpecialCharacters/CheckUtil.java    | 6 ++++++
 .../service/impl/ProjectEntrustInquiryServiceImpl.java    | 2 +-
 .../projectrecord/controller/ProjectRecordController.java | 4 ++--
 .../controller/ProjectSectionController.java              | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
index 60d0272..cc323d2 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
@@ -72,6 +72,12 @@ public class CheckUtil {
             });
         }
     }
+    public void checkName(String s){
+        this.check(s,nameCheckValue);
+    }
+    public void checkNum(String s){
+        this.check(s,numCheckValue);
+    }
 
     public void check(String s,String checkValue) {
         //< > | \ / ? : * "
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
index 1370912..ffeec1d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
@@ -229,7 +229,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
     private void checkInquiryVO(InquiryVO inquiryVO){
 
         //zhqbin 20220506 inset 校验项目名称非法字符
-        checkUtil.check(inquiryVO.getTitle());
+        checkUtil.checkName(inquiryVO.getTitle());
         checkUtil.checkBdNameLengh("询价但标题与单号",inquiryVO.getTitle()+inquiryVO.getInquiryNo());
         //询价单ID
         if(StringUtils.isEmpty(inquiryVO.getInquiryId())){
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java
index 908010b..19c4313 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java
@@ -49,7 +49,7 @@ public class ProjectRecordController{
 	@PostMapping("")
 	@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
 	public BaseResponse<Boolean> insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){
-		checkUtil.check(projectRecord.getProjectName());
+		checkUtil.checkName(projectRecord.getProjectName());
 		boolean save = projectRecordService.save(projectRecord);
 		
 		return BaseResponse.success(save);
@@ -67,7 +67,7 @@ public class ProjectRecordController{
 	@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
 	public BaseResponse<Boolean> update(
 			@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){
-		checkUtil.check(projectRecord.getProjectName());
+		checkUtil.checkName(projectRecord.getProjectName());
 		return BaseResponse.success(projectRecordService.updateProject(projectRecord));
 	}
 	
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
index 26e2ebe..7d176e8 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
@@ -47,8 +47,8 @@ public class ProjectSectionController{
 	@PostMapping("")
 	@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
 	public BaseResponse<Boolean> insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){
-		checkUtil.check(projectSection.getBidSectName());
-		checkUtil.check(projectSection.getBidSectBizNum());
+		checkUtil.checkName(projectSection.getBidSectName());
+		checkUtil.checkNum(projectSection.getBidSectBizNum());
 		boolean save = projectSectionService.save(projectSection);
 		
 		return BaseResponse.success(save);
@@ -65,8 +65,8 @@ public class ProjectSectionController{
 	@PutMapping("")
 	@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
 	public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectSectionVO projectSection){
-		checkUtil.check(projectSection.getBidSectName());
-		checkUtil.check(projectSection.getBidSectBizNum());
+		checkUtil.checkName(projectSection.getBidSectName());
+		checkUtil.checkNum(projectSection.getBidSectBizNum());
 		return BaseResponse.success(projectSectionService.update(projectSection));
 	}