Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828

coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java

@@ -148,8 +148,8 @@ public class EcSyncServiceImpl implements EcSyncService {
         //有就更新ec没有就插入
         if (newUserInfo != null) {
             //招商客户姓名为空
-            if (StringUtil.isEmpty(newUserInfo.getUsername())) {
-                newUserInfo.setUsername(newUserInfo.getUsername());
+            if (ObjectUtil.isNull(newUserInfo.getUsername())||StringUtil.isEmpty(newUserInfo.getUsername())) {
+                newUserInfo.setUsername(resultUser.getUsername());
                 hyPartnerUserInfoDAO.updateByPrimaryKeySelective(newUserInfo);
             }
             // EC与沪姨合伙人同时存在的线索用户，但用户姓名不同，将沪姨合伙人线索姓名同步至EC覆盖原EC线索姓名
@@ -223,6 +223,12 @@ public class EcSyncServiceImpl implements EcSyncService {
         }
     }
 
+    public static void main(String[] args) {
+        Integer a=null;
+        System.out.println(a.equals("bb"));
+
+    }
+
     /**
      * 得到不带86开头的号码
      *

coolstore-partner-service/src/main/java/com/cool/store/utils/poi/ExcelUtil.java

@@ -911,7 +911,7 @@ public class ExcelUtil<T> {
      * 创建一个工作簿
      */
     public void createWorkbook() {
-        this.wb = new SXSSFWorkbook(500);
+        this.wb = new SXSSFWorkbook(800);
     }
 
     /**