From b464767688d71efac0a2a898b6c754c206f5360c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 01:24:06 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisCustomerUserController.java  | 33 +++++++++++++++++--
 .../impl/EmisCustomerUserServiceImpl.java     |  1 -
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index 7d108b45c..4369ad36b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -16,7 +16,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisDestination;
+import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,6 +54,11 @@ public class EmisCustomerUserController extends BaseController
     @Autowired
     private IEmisCustomerUserService emisCustomerUserService;
 
+    @Autowired
+    private EmisBaseService emisBaseService;
+
+
+
     /**
      * 查询快递客户用户列表
      */
@@ -115,8 +123,18 @@ public class EmisCustomerUserController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser)
     {
-//        emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
-        return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
+        try {
+            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+            if(oldUser!=null){
+                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
+            }
+            return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
+        } catch (DuplicateKeyException e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据重复!");
+        }
+
+
     }
 
     /**
@@ -127,7 +145,16 @@ public class EmisCustomerUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EmisCustomerUser emisCustomerUser)
     {
-        return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
+        try {
+//            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+//            if(oldUser!=null){
+//                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
+//            }
+            return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
+        } catch (DuplicateKeyException e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据重复!");
+        }
     }
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
index 5e90276d6..422c37eb1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
@@ -65,7 +65,6 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
     public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser)
     {
 
-
         EmisCustomerUser crtUser=createCustomerUser(emisCustomerUser);
 //        return emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser);
         return 1;