更新：1.获取用户信息返回用户类型；2.政策列表处理政策标签；3.岗位列表添加查询条件等。

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -5,6 +5,8 @@ import java.util.Set;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.cms.domain.IDCardInfo;
+import com.ruoyi.cms.service.impl.AppUserServiceImpl;
+import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwTokenResult;
 import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwUserLogin;
@@ -45,6 +47,9 @@ public class SysLoginController
     private OauthLoginHlwService oauthLoginHlwService;
     @Autowired
     private SsoService ssoService;
+
+    @Autowired
+    private AppUserServiceImpl appUserService;
     /**
      * 登录方法
      * 
@@ -165,8 +170,17 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        //获取相关联的appUser的用户类型
+        String userType = null;
+        if (user != null &&  user.getAppUserId() != null) {
+            AppUser appUser = appUserService.selectAppUserByUserId(user.getAppUserId());
+            if (appUser != null) {
+                userType = appUser.getUserType();
+            }
+        }
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
+        ajax.put("userType", userType);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         return ajax;

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

@@ -562,6 +562,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(esJobSearch.getJobLocation())){
             wrapper.and(x->x.like(ESJobDocument::getJobLocation,esJobSearch.getJobLocation()));
         }
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyName())){
+            wrapper.and(x->x.like(ESJobDocument::getCompanyName,esJobSearch.getCompanyName()));
+        }
         //按时间段来查询数据
         if(esJobSearch.getStartDate() != null){
             Date startDateTime = esJobSearch.getStartDate();
@@ -896,6 +899,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
             newSearch.setCode(esJobSearch.getCode());
         }
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyName())){
+            newSearch.setCompanyName(esJobSearch.getCompanyName());
+        }
 
         LambdaEsQueryWrapper<ESJobDocument> wrapper = getWrapper(newSearch,jobIds);
 

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

@@ -1083,10 +1083,17 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
                             .eq(JobCollection::getUserId, SecurityUtils.getUserId())
                             .in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList())))
                     .stream().map(JobCollection::getJobId).collect(Collectors.toSet());
+            Set<Long> applyJobIds = new HashSet<>();
+            List<Job> jobList = jobApplyMapper.applyJob(SiteSecurityUtils.getUserId());
+            if (CollectionUtils.isNotEmpty(jobList)) {
+                applyJobIds = jobApplyMapper.applyJob(SiteSecurityUtils.getUserId()).stream().map(Job::getJobId).collect(Collectors.toSet());
+            }
             for (ESJobDocument j : jobs) {
                 if (collectionIds.contains(j.getJobId())) {
                     j.setIsCollection(1);
                 }
+                //是否
+                j.setIsApply(applyJobIds != null && applyJobIds.contains(j.getJobId()) ? 1 : 0);
             }
         }
         return jobs;

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

@@ -61,6 +61,10 @@ public class PolicyInfoServiceImpl implements IPolicyInfoService {
 
     @Override
     public List<PolicyInfo> selectList(PolicyInfoQuery query) {
+        if (StringUtils.isNotEmpty(query.getPolicyTag())) {
+            List<String> policyTags = Arrays.asList(query.getPolicyTag().split(","));
+            query.setPolicyTags(policyTags);
+        }
         return policyInfoMapper.selectPolicyInfoList(query);
     }