修改一体机密码登录——先指定求职者，如果求职者查不到，就放开角色权限

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

@@ -648,10 +648,36 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
 
     @Override
     public AppUser getYtjValidPhone(String phone) {
-        return appUserMapper.selectOne(new LambdaQueryWrapper<AppUser>()
+        return queryPhoneUser(phone);
-                .eq(AppUser::getPhone, phone).eq(AppUser::getDelFlag,"0")
+    }
+
+    /**
+     * 查询用户
+     * @param phone
+     * @return
+     */
+    public AppUser queryPhoneUser(String phone) {
+        AppUser user = appUserMapper.selectOne(buildBaseQuery(phone)
                 .isNotNull(AppUser::getIsCompanyUser)
-                .eq(AppUser::getIsCompanyUser, "1")
+                .eq(AppUser::getIsCompanyUser, "1"));
-                .orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
+
+        if (user == null) {
+            user = appUserMapper.selectOne(buildBaseQuery(phone)
+                    .isNotNull(AppUser::getIsCompanyUser));
+        }
+        return user;
+    }
+
+    /**
+     * 基础查询条件
+     * @param phone
+     * @return
+     */
+    private LambdaQueryWrapper<AppUser> buildBaseQuery(String phone) {
+        return new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getPhone, phone)
+                .eq(AppUser::getDelFlag, "0")
+                .orderByDesc(AppUser::getUpdateTime)
+                .last("LIMIT 1");
     }
 }