From 2c8d2ea639bab62e46c6c320ab2b6a4e735d8c93 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 30 Aug 2024 10:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PersonMgeServiceImpl.java    | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
index dde3e94..3dfcbc7 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
@@ -465,7 +465,11 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
             String existData2 = isExistData(sameList2);
             String existData3 = isExistData(sameList3);
             String existData4 = isExistData(sameList4);
-            if (StringUtils.isNotBlank(existData)) {
+            String errorInfo = returnErrorInfo(existData, existData2, existData3, existData4);
+            if(StringUtils.isNotBlank(errorInfo)){
+                return AjaxResult.error(errorInfo);
+            }
+            /*if (StringUtils.isNotBlank(existData)) {
                 return AjaxResult.error(existData);
             }
             if (StringUtils.isNotBlank(existData2)) {
@@ -476,7 +480,7 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
             }
             if (StringUtils.isNotBlank(existData4)) {
                 return AjaxResult.error(existData4);
-            }
+            }*/
             // 校验库中数据的身份证号、手机号、安全帽编号、马甲编号是否重复
             List<Map<String, String>> personIsExist = mapper.personIsExist(new PersonVo());
             List<Map<String, String>> aqmCodes = mapper.aqmCodeIsExist();
@@ -535,6 +539,28 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
         return AjaxResult.success();
     }
 
+    public String returnErrorInfo(String existData,String existData2,String existData3,String existData4){
+        if(StringUtils.isEmpty(existData) && StringUtils.isEmpty(existData2)
+                && StringUtils.isEmpty(existData3)&& StringUtils.isEmpty(existData4)){
+            return null;
+        }else{
+            StringBuffer sb = new StringBuffer();
+            if(StringUtils.isNotEmpty(existData)){
+                sb.append(existData + "<br>");
+            }
+            if(StringUtils.isNotEmpty(existData2)){
+                sb.append(existData2 + "<br>");
+            }
+            if(StringUtils.isNotEmpty(existData3)){
+                sb.append(existData3 + "<br>");
+            }
+            if(StringUtils.isNotEmpty(existData4)){
+                sb.append(existData4 + "<br>");
+            }
+            return sb.toString();
+        }
+    }
+
     @Override
     public AjaxResult getPersonFace(BraceletParamsDto dto) {
         if (StringUtils.isBlank(dto.getFilePath())) {
@@ -752,6 +778,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
      * @date 2024/7/17 10:39
      */
     public Integer setSexData(String value) {
+        if(StringUtils.isEmpty(value)){
+            return null;
+        }
         switch (value) {
             case BusinessConstants.MAN:
                 return 0;