Browse Source

导表时 企微主体可以不填

lqc 5 years ago
parent
commit
a4eb54b195

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

@@ -129,7 +129,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
 
             // 获取企微主题相关信息
             // 获取企微主题相关信息
             Corp corp = corpService.getOne(new LambdaQueryWrapper<Corp>().eq(Corp::getName, cell.get("workWxCorp")).last("limit 1"));
             Corp corp = corpService.getOne(new LambdaQueryWrapper<Corp>().eq(Corp::getName, cell.get("workWxCorp")).last("limit 1"));
-            if (null == corp) {
+            if (null == corp && (null != cell.get("workWxCorp") || !cell.get("workWxCorp").isEmpty())) {
                 throw new Exception("第" + (i + 1) + "行," + "无法根据企业微信主体名称找到相关信息");
                 throw new Exception("第" + (i + 1) + "行," + "无法根据企业微信主体名称找到相关信息");
             }
             }
 
 
@@ -149,7 +149,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             fosterwxMobile.setWxIdentityCardNo(row.get(i).get("wxIdentityCardNo"));
             fosterwxMobile.setWxIdentityCardNo(row.get(i).get("wxIdentityCardNo"));
             fosterwxMobile.setBankCardNo(row.get(i).get("bankCardNo"));
             fosterwxMobile.setBankCardNo(row.get(i).get("bankCardNo"));
             fosterwxMobile.setBankCardMobileNo(row.get(i).get("bankCardMobileNo"));
             fosterwxMobile.setBankCardMobileNo(row.get(i).get("bankCardMobileNo"));
-            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty()) {
+            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty() && null != corp) {
                 fosterwxMobile.setWorkWxCorpId(corp.getId());
                 fosterwxMobile.setWorkWxCorpId(corp.getId());
             }
             }
             if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()) {
             if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()) {