update

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

@@ -100,8 +100,12 @@ 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"));
-            fosterwxMobile.setWorkWxCorp(row.get(i).get("workWxCorp"));
-            fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"),df));
+            if (row.get(i).get("workWxCorp") != null){
+                fosterwxMobile.setWorkWxCorp(row.get(i).get("workWxCorp"));
+            }
+            if (row.get(i).get("workWxRegisterAt") != null){
+                fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"),df));
+            }
             fosterwxMobile.setCreateAt(nowDate);
             fosterwxMobile.setUpdateAt(nowDate);
             fosterwxMobile.setMobileUnioCode(String.format("%02d", fosterwxMobile.getStationId()) + String.format("%02d", fosterwxMobile.getMobileCode()));
@@ -110,17 +114,24 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();
             for (Integer s = 1;s<=3;s++) {
                 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){
+                    continue;
+                }
                 FosterwxMobileWxfriend fosterwxMobileWxfriend = new FosterwxMobileWxfriend();
                 fosterwxMobileWxfriend.setMobileId(fosterwxMobile.getId());
                 fosterwxMobileWxfriend.setCreateAt(nowDate);
                 fosterwxMobileWxfriend.setUpdateAt(nowDate);
                 fosterwxMobileWxfriend.setSeq(s);
-                fosterwxMobileWxfriend.setWxName(row.get(i).get("wxFriendName"+sStr));
-                fosterwxMobileWxfriend.setWxUsername(row.get(i).get("wxFriendUserName"+sStr));
+                fosterwxMobileWxfriend.setWxName(wxFriendName);
+                fosterwxMobileWxfriend.setWxUsername(wxFriendName);
                 addFriend.add(fosterwxMobileWxfriend);
             }
-            fosterwxMobileWxfriendService.remove(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id",fosterwxMobile.getId()));
-            fosterwxMobileWxfriendService.saveBatch(addFriend);
+            if (addFriend.size() > 0){
+                fosterwxMobileWxfriendService.remove(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id",fosterwxMobile.getId()));
+                fosterwxMobileWxfriendService.saveBatch(addFriend);
+            }
         }
 //        this.saveBatch(add);
         return true;