添加一体机身份证登录（身份证和手机号）

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java

@@ -83,4 +83,6 @@ public interface IAppUserService
     public List<AppUserShow> selectUserApplyList(AppUser appUser);
 
     public AppUser getYtjValidPhone(String phone);
+
+    public AppUser getYtjValidIdcard(String phone);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java

@@ -511,7 +511,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     public AppUser selectAppuserByIdcard(String idCard) {
         return appUserMapper.selectOne(Wrappers.<AppUser>lambdaQuery()
                 //.eq(AppUser::getIdCard, idCard)
-                .apply("UPPER(id_card) = {0}", idCard)
+                .apply("UPPER(id_card) = {0}", StringUtil.toUpperCaseIgnoreBlank(idCard))
                 .eq(AppUser::getDelFlag,"0")
                 .orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
     }
@@ -651,6 +651,28 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
         return queryPhoneUser(phone);
     }
 
+    @Override
+    public AppUser getYtjValidIdcard(String phone) {
+        return queryIdcardUser(phone);
+    }
+
+    /**
+     * 查询用户
+     * @param phone
+     * @return
+     */
+    private AppUser queryIdcardUser(String phone) {
+        AppUser user = appUserMapper.selectOne(buildBaseIdcardQuery(phone)
+                .isNotNull(AppUser::getIsCompanyUser)
+                .eq(AppUser::getIsCompanyUser, "1"));
+
+        if (user == null) {
+            user = appUserMapper.selectOne(buildBaseIdcardQuery(phone)
+                    .isNotNull(AppUser::getIsCompanyUser));
+        }
+        return user;
+    }
+
     /**
      * 查询用户
      * @param phone
@@ -680,4 +702,11 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
                 .orderByDesc(AppUser::getUpdateTime)
                 .last("LIMIT 1");
     }
+
+    private LambdaQueryWrapper<AppUser> buildBaseIdcardQuery(String idCard) {
+        return  new LambdaQueryWrapper<AppUser>()
+                .apply("UPPER(id_card) = {0}", idCard)
+                .eq(AppUser::getDelFlag,"0")
+                .orderByDesc(AppUser::getUpdateTime).last("LIMIT 1");
+    }
 }