From c4a612344a35b7a0a4a5072fbfbfc5d831b2f8ff Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 30 Jul 2022 19:50:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/basic/BasicUnitMaintainController.java  | 5 ++++-
 .../sale/admin/controller/basic/UdiRelevanceController.java  | 2 +-
 .../sale/admin/entity/basic/BasicUnitMaintainEntity.java     | 5 +++++
 .../mybatis/mapper/basic/BussinessOriginTypeDao.xml          | 4 +++-
 .../main/resources/mybatis/mapper/basic/BussinessTypeDao.xml | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java
index 05cf55a..66ee825 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java
@@ -138,7 +138,10 @@ public class BasicUnitMaintainController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/update")
-    public BaseResponse update(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest) {
+    public BaseResponse update(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
         basicUnitMaintainSaveRequest.setUpdateTime(new Date());
         basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
         return ResultVOUtils.success("修改成功");
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
index 18d4f23..873eb51 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
@@ -641,7 +641,7 @@ public class UdiRelevanceController {
             for (UdiRelevanceResponse temp : temps) {
                 if (temp.getMainId() != null)
                     if (temp.getNameCode().equals(temp.getMainId())) {
-                        return ResultVOUtils.error(500, "已存在未关联的第三方产品ID，无法接触绑定！");
+                        return ResultVOUtils.error(500, "已存在未关联的第三方产品ID，无法解除绑定！");
                     }
             }
         }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java
index f9c21b5..bb91cd9 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java
@@ -2,6 +2,7 @@ package com.glxp.sale.admin.entity.basic;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 @Data
@@ -9,11 +10,15 @@ public class BasicUnitMaintainEntity {
 
     private Integer id;
     private String erpId;
+
+    @NotEmpty(message = "往来单位名称不能为空！")
     private String name;
     private String spell;
     private String addr;
     private String status;
     private String type;
+
+    @NotEmpty(message = "统一社会信用号不能为空！")
     private String creditNo;
     private String contact;
     private String mobile;
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
index 59c7faf..e55ef27 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
@@ -67,7 +67,9 @@
             <if test="action != ''and action != null">
                 AND action LIKE concat(#{action},'%')
             </if>
-
+            <if test="thirdSys != '' and thirdSys != null">
+                AND thirdSys = #{thirdSys}
+            </if>
         </where>
     </select>
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 8144ecf..bef3f11 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -99,7 +99,7 @@
             <if test="mainAction != ''and mainAction != null">
                 AND mainAction LIKE concat(#{mainAction},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
+            <if test="enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
             </if>
             <if test="advanceType != ''and advanceType != null">