From 67c32f8f21c5ada7114274b514b9e08628989366 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 May 2024 11:03:55 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 531951561..020c6b28d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -162,6 +162,20 @@ public class EmisBaseService {
          List<EmisCustomerUser> emisCustomerUserList=emisCustomerUserMapper.selectEmisCustomerUserList(queryEmisCustomerUser);
          for(EmisCustomerUser user:emisCustomerUserList){
              EmisCustomerUser crt=createCustomerUser(user);
+             if(crt.getCustomerCode() != null){
+                 continue;
+             }
+
+             String siteCode = crt.getOwnerSite();
+             if(StringUtils.isEmpty(siteCode)){
+                 siteCode="88888";
+             }
+             String customerCode=genCustomerCode(siteCode);
+             crt.setCustomerCode(customerCode);
+             crt.setOwnerSite(siteCode);
+             crt.setUserName(crt.getCustomerCode());
+             crt.preUpdate();
+             emisCustomerUserMapper.updateEmisCustomerUser(crt);
          }
      }
 
@@ -185,7 +199,7 @@ public class EmisBaseService {
          if(CollectionUtils.isEmpty(emisCustomerUserList)){
              // 产生 customerCode
              String siteCode = emisCustomerUser.getOwnerSite();
-             if(siteCode==null){
+             if(StringUtils.isEmpty(siteCode)){
                  siteCode="88888";
              }
              String customerCode=genCustomerCode(siteCode);
@@ -193,9 +207,9 @@ public class EmisBaseService {
              emisCustomerUser.setOwnerSite(siteCode);
              emisCustomerUser.setUserName(emisCustomerUser.getCustomerCode());
 
-             emisCustomerUser.setCustomerType("1");
-             emisCustomerUser.setSettledType("1");
-             emisCustomerUser.setUserType("1");
+//             emisCustomerUser.setCustomerType("1");
+//             emisCustomerUser.setSettledType("1");
+//             emisCustomerUser.setUserType("1");
 
              emisCustomerUser.preInsert();