Browse Source

fix 用户导入

he2802 3 years ago
parent
commit
ff7c2ee0cd

+ 1 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -759,7 +759,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             User user = getOne(new LambdaQueryWrapper<User>()
             User user = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone,itemImport.getTelphone()).last("limit 1"));
                     .eq(User::getTelphone,itemImport.getTelphone()).last("limit 1"));
             if(Validator.isNotNull(user)){
             if(Validator.isNotNull(user)){
-                if(Validator.isNotEmpty(user.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
+                if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
                     throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
                     throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
                 }
                 }
                 if(Validator.isEmpty(user.getIdCard())){
                 if(Validator.isEmpty(user.getIdCard())){