|
|
@@ -544,9 +544,10 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
|
|
|
Systemparam sysParm = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_CARD_NOTWO));
|
|
|
//校验唯一性
|
|
|
List<Userinfo> userinfoList = iUserinfoMapper.selectList(new QueryWrapper<Userinfo>()
|
|
|
- .eq("cardnum", EncryptionUtils.encryptByAES(wui.getCardnum()))
|
|
|
+ .and(a -> a.eq(StringUtils.isNotBlank(wui.getCardnum()), "cardnum", wui.getCardnum())
|
|
|
+ .eq("cardtypeid", wui.getCardtype()))
|
|
|
.or()
|
|
|
- .eq("mobile", EncryptionUtils.encryptByAES(wui.getMobilephone()))
|
|
|
+ .eq("mobile", wui.getMobilephone())
|
|
|
.and(a -> a.eq("userstatus", 1)));
|
|
|
if (CollectionUtils.isNotEmpty(userinfoList)) {
|
|
|
for (Userinfo userinfo : userinfoList) {
|
|
|
@@ -611,7 +612,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
|
|
|
if (wui.getUserstate() == 2) {
|
|
|
// 3:初审拒绝
|
|
|
wui.setUserstate(3);
|
|
|
- }else if (wui.getUserstate() == 4){
|
|
|
+ } else if (wui.getUserstate() == 4) {
|
|
|
// 5:复审拒绝
|
|
|
wui.setUserstate(5);
|
|
|
}
|