|
|
@@ -129,10 +129,9 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
|
|
|
if (mobileInfo != null) {
|
|
|
throw new Exception("第" + (i + 1) + "行,手机编号:" + mobileCode + ",已存在相同记录");
|
|
|
}
|
|
|
-
|
|
|
// 获取企微主题相关信息
|
|
|
Corp corp = corpService.getOne(new LambdaQueryWrapper<Corp>().eq(Corp::getName, cell.get("workWxCorp")).last("limit 1"));
|
|
|
- if (null == corp && (null != cell.get("workWxCorp") || !cell.get("workWxCorp").isEmpty())) {
|
|
|
+ if (corp == null && (cell.get("workWxCorp") != null && !cell.get("workWxCorp").isEmpty())) {
|
|
|
throw new Exception("第" + (i + 1) + "行," + "无法根据企业微信主体名称找到相关信息");
|
|
|
}
|
|
|
|
|
|
@@ -179,7 +178,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
|
|
|
if (wxFriendName == null || wxFriendName.isEmpty()) {
|
|
|
continue;
|
|
|
}
|
|
|
- if(friendsNames.get(wxFriendName) == null){
|
|
|
+ if(friendsNames.get(wxFriendName) != null){
|
|
|
throw new Exception("第" + (i + 1) + "行," +wxFriendName+ "微信好友名称录入重复");
|
|
|
}
|
|
|
friendsNames.put(wxFriendName,true);
|