update

src/main/java/com/mokamrp/privates/help/Analysis.java

@@ -76,9 +76,10 @@ public class Analysis {
                     String tempKey = field.get(j);
                     cell.put(tempKey,sheetRow.getCell(j).getStringCellValue());
                 }
-                //将装有每一列的集合装入大集合
-                row.add(cell);
-
+                if (!cell.isEmpty()){
+                    //将装有每一列的集合装入大集合
+                    row.add(cell);
+                }
                 //关闭资源
                 workbook.close();
             }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileServiceImpl.java

@@ -100,10 +100,10 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             fosterwxMobile.setWxIdentityCardNo(row.get(i).get("wxIdentityCardNo"));
             fosterwxMobile.setBankCardNo(row.get(i).get("bankCardNo"));
             fosterwxMobile.setBankCardMobileNo(row.get(i).get("bankCardMobileNo"));
-            if (row.get(i).get("workWxCorp") != null){
+            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty()){
                 fosterwxMobile.setWorkWxCorp(row.get(i).get("workWxCorp"));
             }
-            if (row.get(i).get("workWxRegisterAt") != null){
+            if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()){
                 fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"),df));
             }
             fosterwxMobile.setCreateAt(nowDate);
@@ -116,7 +116,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
                 String sStr = s.toString();
                 String wxFriendName = row.get(i).get("wxFriendName"+sStr);
                 String wxFriendUserName = row.get(i).get("wxFriendUserName"+sStr);
-                if (wxFriendName == null || wxFriendUserName == null){
+                if (wxFriendName == null || wxFriendName.isEmpty()){
                     continue;
                 }
                 FosterwxMobileWxfriend fosterwxMobileWxfriend = new FosterwxMobileWxfriend();
@@ -125,7 +125,9 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
                 fosterwxMobileWxfriend.setUpdateAt(nowDate);
                 fosterwxMobileWxfriend.setSeq(s);
                 fosterwxMobileWxfriend.setWxName(wxFriendName);
-                fosterwxMobileWxfriend.setWxUsername(wxFriendName);
+                if (wxFriendUserName != null && !wxFriendUserName.isEmpty()){
+                    fosterwxMobileWxfriend.setWxUsername(wxFriendUserName);
+                };
                 addFriend.add(fosterwxMobileWxfriend);
             }
             if (addFriend.size() > 0){