优化es查询

buildAndStart.sh

@@ -8,10 +8,10 @@ LOG_PATH=${DES_PATH}/logs
 LOG_FILE=${LOG_PATH}/backend.log
 BACK_LOG=${LOG_PATH}/back/backend-info.log
 MODEL_NAME=${JAR_PATH}
-PROFILE=dev
+PROFILE=test
 
 # JVM配置
-JVM_MEMORY=" -Xms2048M -Xmx2048M -XX:MaxDirectMemorySize=2048M"
+JVM_MEMORY=" -Xms2048M -Xmx2048M -XX:MaxDirectMemorySize=2048M -Dlicpath:/root/ks/license.xml"
 # 远程调试
 JVM_DEBUG=""
 # JVM_DEBUG=" -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6011"

ruoyi-admin/src/main/resources/application-prod.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 9091
+    port: 9096
     servlet:
         # 应用的访问路径
         context-path: /
@@ -225,10 +225,10 @@ ocr:
     ocr_llm_apiKey: NfzPnFRtogHlYCAh2hHIB7ra5EsrSQEM
 
 cipher-security:
-    socket: 39.102.146.78:11028
+#    socket: 39.102.146.78:11028
-    path: /data/downloadmodel/certTest
+#    path: /data/downloadmodel/certTest
-#  socket: 10.98.80.223:8443
+  socket: 10.98.80.223:8443
-#  path: /data/downloadmodel/cert
+  path: /data/downloadmodel/cert
 
 #nginx节点健康检查
 management:

ruoyi-admin/src/main/resources/application-test.yml

@@ -0,0 +1,336 @@
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.8.8
+    # 版权年份
+    copyrightYear: 2024
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: D:/ruoyi/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 9091
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+# 日志配置
+logging:
+    level:
+        com.ruoyi: debug
+        org.springframework: warn
+
+# 用户配置
+user:
+    password:
+        # 密码最大错误次数
+        maxRetryCount: 5
+        # 密码锁定时间（默认10分钟）
+        lockTime: 10
+
+# Spring配置
+spring:
+    # 资源信息
+    messages:
+        # 国际化资源文件路径
+        basename: i18n/messages
+    # 文件上传
+    servlet:
+        multipart:
+            # 单个文件大小
+            max-file-size: 10MB
+            # 设置总上传的文件大小
+            max-request-size: 20MB
+    # 服务模块
+    devtools:
+        restart:
+            # 热部署开关
+            enabled: true
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.highgo.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:highgo://127.0.0.1:5866/highgo?useUnicode=true&characterEncoding=utf8&currentSchema=ks_db4&stringtype=unspecified
+                username: sysdba
+                password: ZKR2024@comzkr
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 初始连接数
+            initialSize: 10
+            # 最小连接池数量
+            minIdle: 30
+            # 最大连接池数量
+            maxActive: 50
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT version()
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 5379
+        # 数据库索引
+        database: 5
+        # 密码
+        password: ZKR2024@@.com
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    # redis 配置
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: Abc123!@#Def456$%^Ghi789&*()Jkl0+-=MnoPqrStuVwxYz987$%^654@#$321!@#ZyxWvu
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+
+## MyBatis配置
+#mybatis:
+#  # 搜索指定包别名
+#  typeAliasesPackage: com.ruoyi.**.domain
+#  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#  mapperLocations: classpath*:mapper/**/*Mapper.xml
+#  # 加载全局的配置文件
+#  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+    helperDialect: oracle
+    supportMethodsArguments: true
+    params: count=countSql
+
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: true
+    # 请求前缀
+    pathMapping:
+
+# 防止XSS攻击
+xss:
+    # 过滤开关
+    enabled: true
+    # 排除链接（多个用逗号分隔）
+    excludes: /system/notice
+    # 匹配链接
+    urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+createSqlSessionFactory:
+    # 选择MyBatis配置方式，mybatis / mybatis-plus
+    use: mybatis-plus
+
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis Plus配置
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+    global-config:
+        db-config:
+            # 标识逻辑删除的数据库字段名称
+            logic-delete-field: delFlag
+            # 表示已逻辑删除的值(默认也是如此)
+            logic-delete-value: 2
+            # 表示未逻辑删除的值(默认也是如此)
+            logic-not-delete-value: 0
+
+file:
+    upload-dir: /data/file
+
+ocr:
+    ocr_url: http://127.0.0.1:9001/ocr
+    ocr_mutipart: https://qd.zhaopinzao8dian.com/ocr-api/ocr
+    #  ocr_mutipart: http://10.98.80.141:9000/ocr
+    ocr_llm_url: http://39.98.44.136:6016/inner-ai/aicoapi/gateway/v2/chatbot/api_run/1763386387_d4c07131-a047-4c0d-9623-7e3c3a45bd7e
+    ocr_llm_apiKey: NfzPnFRtogHlYCAh2hHIB7ra5EsrSQEM
+
+cipher-security:
+    socket: 39.102.146.78:11028
+    path: /data/downloadmodel/certTest
+#  socket: 10.98.80.223:8443
+#  path: /data/downloadmodel/cert
+
+#nginx节点健康检查
+management:
+    endpoints:
+        web:
+            exposure:
+                include: health
+
+#微信小程序
+wx:
+    appid: wx4aa34488b965a331
+    secret: 558780ecc2750f87e556b0e5496773c9
+
+
+# easy-es
+easy-es:
+    enable: true
+    banner: false
+    address: 127.0.0.1:9200
+    global-config:
+        process-index-mode: manual
+        db-config:
+            refresh-policy: immediate
+    username: elastic
+    password: zkr2024@@.com
+
+#短信服务
+sms:
+    #API密钥账号
+    #  secretName: kszhjyrcjt
+    secretName: kszhjypthydx
+    #API密钥
+    #  secretKey: Dwhc9c0IiHecvC5D
+    secretKey: asj1gze3BhG3QtaI
+    #短信模板ID
+    #  templateId: 37446
+    templateId: 49566
+
+#统一门户认证
+oauth:
+    #客户端的ID
+    appid: 251112100000000015
+    #授权码
+    clientsecretkey: 2a44cb8d21dcf4b0777881ca11ea0d83ebea94bbe1ab1f405508db0873cdcc99
+    #内网
+    usptnw:
+        #获取访问令牌
+        nwGatewayGetTokenUrl: http://10.98.80.146/uspt/serviceAPI/getToken
+        #获取用户信息
+        nwGatewayGetUserInfoUrl: http://10.98.80.146/uspt/serviceAPI/getUserInfo
+    #外网
+    usptww:
+        #门户注册
+        wwRegisterPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebRegister
+        #门户登录
+        wwTokenPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/doWebLogon
+        #查询用户信息
+        wwQueryWebUserInfo: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebUserInfo
+        #查询个人信息
+        wwQueryWebPersonalInfoPostUrl: http://10.98.80.50/uspt/webWhiteListServiceAPI/queryWebPersonalInfo
+        #查询单位信息
+        wwQueryWebEnterpriseInfoPostUrl: http://10.98.80.50/uspt//webWhiteListServiceAPI/queryWebEnterpriseInfo
+    #用户新增接口
+    tyAddUserUrl: http://10.98.80.146/qxgl_backend/security/add_user
+    #获取当前用户有权系统列表
+    tyQueryUserSysListUrl: http://10.98.80.146/qxgl_backend/security/get_effective_app_list
+    #获取当前用户有权角色列表
+    tyQueryUserRoleListUrl: http://10.98.80.146/qxgl_backend/security/get_role_by_userid
+    #获取角色功能权限信息
+    tyQueryRoleInfoUrl: http://10.98.80.146/qxgl_backend/security/get_path_by_role
+    #获取用户详细信息
+    tyQueryUserInfo: http://10.98.80.146/qxgl_backend/security/get_user_by_userid
+    #获取机构详细信息
+    tyQueryUnitInfo: http://10.98.80.146/qxgl_backend/security/get_organization_by_organizationid
+    connect-timeout: 10
+    read-timeout: 30
+    write-timeout: 30
+
+#浪潮
+lc:
+    #获取人员标签
+    personTag: http://10.98.80.146/prod-api/dispatch/public/person/tag
+
+#ai
+chat:
+    baseUrl: http://192.168.133.200:8080
+    chatUrl: /v1/chat/completions
+    chatDetailUrl: /core/chat/getPaginationRecords
+    chatHistoryUrl: /core/chat/getHistories
+    updateNameUrl: /core/chat/updateHistory
+    stickChatUrl: /core/chat/updateHistory
+    delChatUrl: /core/chat/delHistory
+    delAllChatUrl: /core/chat/clearHistories
+    guestUrl: /v1/chat/completions
+    praiseUrl: /core/chat/feedback/updateUserFeedback
+    appId: 67cd49095e947ae0ca7fadd8
+    apiKey: fastgpt-qMl63276wPZvKAxEkW77bur0sSJpmuC6Ngg9lzyEjufLhsBAurjT55j
+    model: qd-job-turbo
+
+audioText:
+    asr: http://192.168.133.200:8000/asr/file
+    #tts: http://192.168.133.200:19527/synthesize
+    tts: http://10.98.76.104:19528/synthesize

ruoyi-admin/src/main/resources/logback.xml

@@ -1,17 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 日志存放路径 -->
+    <property name="log.path" value="./logs"/>
-	<property name="log.path" value="/home/lapuda/logs" />
+    <property name="my.ip" value="${MY_IP:-127.0.0.1}"/>
-    <!-- 日志输出格式 -->
+    <property name="console.log.pattern"
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
 
     <!-- 控制台输出 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-			<pattern>${log.pattern}</pattern>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
         </encoder>
     </appender>
 
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 15 -->
+            <maxHistory>14</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>DEBUG</level>
+        </filter>
+    </appender>
+
     <!-- 系统日志输出 -->
     <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-info.log</file>
@@ -19,8 +40,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
+            <!-- 日志最大的历史 15天 -->
-			<maxHistory>60</maxHistory>
+            <maxHistory>15</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -57,37 +78,32 @@
         </filter>
     </appender>
 
-	<!-- 用户访问日志输出  -->
+    <!-- info异步输出 -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
-		<file>${log.path}/sys-user.log</file>
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <discardingThreshold>0</discardingThreshold>
-            <!-- 按天回滚 daily -->
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+        <queueSize>512</queueSize>
-            <!-- 日志最大的历史 60天 -->
+        <!-- 添加附加的appender,最多只能添加一个 -->
-            <maxHistory>60</maxHistory>
+        <appender-ref ref="file_info"/>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
     </appender>
 
-	<!-- 系统模块日志级别控制  -->
+    <!-- error异步输出 -->
-	<logger name="com.ruoyi" level="info" />
+    <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
-	<!-- Spring日志级别控制  -->
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-	<logger name="org.springframework" level="warn" />
+        <discardingThreshold>0</discardingThreshold>
-
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-	<root level="info">
+        <queueSize>512</queueSize>
-		<appender-ref ref="console" />
+        <!-- 添加附加的appender,最多只能添加一个 -->
-	</root>
+        <appender-ref ref="file_error"/>
+    </appender>
 
     <!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="file_info" />
+        <appender-ref ref="console"/>
-        <appender-ref ref="file_error" />
+        <appender-ref ref="async_info"/>
+        <appender-ref ref="async_error"/>
+        <appender-ref ref="file_console"/>
     </root>
 
-	<!--系统用户操作日志-->
-    <logger name="sys-user" level="info">
-        <appender-ref ref="sys-user"/>
-    </logger>
 </configuration>

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java

@@ -88,6 +88,9 @@ public class CmsJobController extends BaseController
     {
         if (RoleUtils.isCompanyAdmin()) {
             Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard());
+            if(company==null){
+                return getDataTable(new ArrayList<>());
+            }
             job.setCompanyId(Objects.nonNull(company) ? company.getCompanyId() : null);
         }
         startPage();

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java

@@ -24,6 +24,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -54,6 +55,9 @@ public class CompanyController extends BaseController
     {
         if (RoleUtils.isCompanyAdmin()) {
             System.out.println("企业社会信用代码============================="+RoleUtils.getCurrentUseridCard());
+            if(company==null){
+                return getDataTable(new ArrayList<>());
+            }
             company.setCode(RoleUtils.getCurrentUseridCard());
         }
         startPage();

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

@@ -491,12 +491,31 @@ public class ESJobSearchImpl implements IESJobSearchService
     private LambdaEsQueryWrapper<ESJobDocument> getWrapper(ESJobSearch esJobSearch,List<Long> jobIds){
 
         LambdaEsQueryWrapper<ESJobDocument> wrapper = new LambdaEsQueryWrapper<>();
-        if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){
+        /*if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){
             for (String keyWord:esJobSearch.getJobTitle().split(",")) {
-                wrapper.and(a -> a.match(ESJobDocument::getJobTitle, keyWord, 5.0f)
+                wrapper.or(a -> a.match(ESJobDocument::getJobTitle, keyWord, 5.0f)
                 );
             }
-
+        }*/
+        //优化岗位名称查询，只有命中岗位名称或者分类就行
+        String titleStr = esJobSearch.getJobTitle();
+        String cateStr = esJobSearch.getJobCategory();
+        boolean hasTitle = !StringUtil.isEmptyOrNull(titleStr);
+        boolean hasCate = !StringUtil.isEmptyOrNull(cateStr);
+        if (hasTitle || hasCate) {
+            wrapper.and(sub -> {
+                if (hasTitle) {
+                    String[] words = titleStr.split(",");
+                    for (String w : words) {
+                        if (!StringUtil.isEmptyOrNull(w)) {
+                            sub.or().match(ESJobDocument::getJobTitle, w, 5.0f);
+                        }
+                    }
+                }
+                if (hasCate) {
+                    sub.or().eq(ESJobDocument::getJobCategory, cateStr);
+                }
+            });
         }
 
         if(esJobSearch.getLongitude()!=null){
@@ -509,10 +528,10 @@ public class ESJobSearchImpl implements IESJobSearchService
             wrapper.and(x->x.in(ESJobDocument::getEducation,integers));
         }
         if(Objects.nonNull(esJobSearch.getMaxSalary())){
-            wrapper.and(x->x.le(ESJobDocument::getMaxSalary,esJobSearch.getMaxSalary()));
+            wrapper.and(x->x.le(ESJobDocument::getMinSalary,esJobSearch.getMaxSalary()));
         }
         if(Objects.nonNull(esJobSearch.getMinSalary())){
-            wrapper.and(x->x.ge(ESJobDocument::getMinSalary,esJobSearch.getMinSalary()));
+            wrapper.and(x->x.ge(ESJobDocument::getMaxSalary,esJobSearch.getMinSalary()));
         }
         if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){
             //Integer maxValue = StringUtil.findMaxValue(esJobSearch.getExperience());
@@ -520,13 +539,13 @@ public class ESJobSearchImpl implements IESJobSearchService
             List<Integer> integers = StringUtil.convertStringToIntegerList(esJobSearch.getExperience());
             wrapper.and(x->x.in(ESJobDocument::getExperience_int,integers));//精准查询
         }
-        if(!StringUtil.isEmptyOrNull(esJobSearch.getJobCategory())){
+        /*if(!StringUtil.isEmptyOrNull(esJobSearch.getJobCategory())){
             //wrapper.and(x->x.eq(ESJobDocument::getJobCategory,esJobSearch.getJobCategory()));
             String targetValue = esJobSearch.getJobCategory();
             wrapper.and(x -> x.like(ESJobDocument::getJobCategory, targetValue)
                     .or()
                     .like(ESJobDocument::getJobTitle, targetValue));
-        }
+        }*/
         if(!StringUtil.isEmptyOrNull(esJobSearch.getScale())){
             //Integer maxValue = StringUtil.findMaxValue(esJobSearch.getScale());
             //wrapper.and(x->x.le(ESJobDocument::getScale,maxValue));

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

@@ -354,13 +354,31 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
         }
         //判断薪资
         Integer userMinSalary = parseSalary(user.getSalaryMin());
-        if (userMinSalary != null && userMinSalary <= job.getMaxSalary()) {
+        Long jobMinSalary = job.getMinSalary();
+        Long jobMaxSalary = job.getMaxSalary();
+        if (userMinSalary != null) {
+            if (jobMinSalary == null && jobMaxSalary == null) {
+                matchScore += 1.0;
+            } else if (!(jobMaxSalary != null && userMinSalary > jobMaxSalary)) {
+                if (jobMinSalary == null) {
+                    matchScore += 1.0;
+                } else {
+                    double salaryThreshold = jobMinSalary * 0.8;
+                    if (userMinSalary >= jobMinSalary) {
+                        matchScore += 1.0;
+                    } else if (userMinSalary >= salaryThreshold) {
+                        matchScore += 0.5;
+                    }
+                }
+            }
+        }
+        /*if (userMinSalary != null && userMinSalary <= job.getMaxSalary()) {
             if (userMinSalary >= job.getMinSalary()) {
                 matchScore += 1;
             } else if (userMinSalary >= job.getMinSalary() * 0.8) {
                 matchScore += 0.5;
             }
-        }
+        }*/
         //判断区域
         if (user.getArea() != null && job.getJobLocationAreaCode() != null) {
             //if(user.getArea().contains(job.getJobLocation()) || job.getJobLocation().contains(user.getArea())){

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java

@@ -294,6 +294,7 @@ public class OauthLoginHlwService {
         String code="";
         String localUsername;
         SysUser sysUser=new SysUser();
+        String userType=StringUtil.IS_COMPANY_USER;
         switch (wwTyInfo.getUsertype()){
             case "1":
                 sysUser.setNickName(wwTyInfo.getName());
@@ -306,6 +307,7 @@ public class OauthLoginHlwService {
                 appUserParm.setIsCompanyUser(StringUtil.IS_JOB_REQUEST_USER);
                 code=wwTyInfo.getIdno();
                 localUsername=StringUtil.USER_KEY+QuickValidUtils.getSm4Encrypt(code);
+                userType=StringUtil.IS_JOB_REQUEST_USER;
                 break;
             default:
                 sysUser.setNickName(wwTyInfo.getEnterprisename());
@@ -330,7 +332,7 @@ public class OauthLoginHlwService {
         sysUser.setPhonenumber(wwTyInfo.getPhone());
         sysUserService.updateUser(sysUser);
         //插入app_user
-        AppUser appUser=appUserService.selectAppuserByIdcard(code);
+        AppUser appUser=appUserService.selectAppuserByIdcard(code,userType);
         if(appUser!=null){
             appUserParm.setUserId(appUser.getUserId());
             appUserService.updateAppUser(appUserParm);