客户端审核bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WskhUserinfoServiceImpl.java

@@ -543,12 +543,23 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         if (param.getAuditflag() == 1) {
             Systemparam sysParm = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_CARD_NOTWO));
             //校验唯一性
-            List<Userinfo> userinfoList = iUserinfoMapper.selectList(new QueryWrapper<Userinfo>()
-                    .and(a -> a.eq(StringUtils.isNotBlank(wui.getCardnum()), "cardnum", wui.getCardnum())
-                            .eq(wui.getCardtype() != null, "cardtypeid", wui.getCardtype()))
-                    .or()
-                    .eq("mobile", wui.getMobilephone())
-                    .and(a -> a.eq("userstatus", 1)));
+            QueryWrapper<Userinfo> wrapper  = new QueryWrapper<>();
+            if(StringUtils.isBlank(wui.getCardnum())){
+                wrapper .eq("mobile", wui.getMobilephone());
+                wrapper .eq("userstatus", 1);
+            }else if (StringUtils.isBlank(wui.getMobilephone())){
+                wrapper .eq("cardnum", wui.getCardnum());
+                wrapper .eq("cardtypeid", wui.getCardtype());
+            }else{
+                wrapper .and(query -> {
+                    query.eq(StringUtils.isNotBlank(wui.getCardnum()), "cardnum", wui.getCardnum());
+                    query.eq(wui.getCardtype() != null, "cardtypeid", wui.getCardtype());
+                });
+                wrapper.or().eq("mobile", wui.getMobilephone());
+                wrapper.and(query -> query.eq("userstatus", 1));
+            }
+
+            List<Userinfo> userinfoList = iUserinfoMapper.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(userinfoList)) {
                 for (Userinfo userinfo : userinfoList) {
                     if (sysParm == null || "1".equals(sysParm.getParamvalue())) {