From a8213022cb8b875d05135b5b2733f7ae12192919 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Thu, 23 Jul 2026 18:59:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=B1=82?=
 =?UTF-8?q?=E8=81=8C=E8=80=85=E6=9D=A1=E4=BB=B6=202.=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9AuserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/cms/mapper/CompanyMapper.java    |  2 ++
 .../cms/service/impl/AppUserServiceImpl.java   |  6 ++++++
 .../resources/mapper/app/AppUserMapper.xml     | 18 +++++++++++++++++-
 .../resources/mapper/app/CompanyMapper.xml     |  9 ++++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java
index 0f46547..ff8e2a4 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java
@@ -34,5 +34,7 @@ public interface CompanyMapper extends BaseMapper<Company>
 
     int updateStatus(Company company);
 
+    int updateLcToLocalStatus(Company company);
+
     List<Company> selectAdminCompanyList(Company company);
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
index befc681..c074148 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
@@ -773,6 +773,12 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
 
     @Override
     public void changeLcCompanyStatus(AppUser appUser) {
+        //修改本地企业状态
+        Company company=new Company();
+        company.setUserId(appUser.getUserId());
+        company.setStatus(Integer.parseInt(appUser.getStatus()));
+        int i=companyMapper.updateLcToLocalStatus(company);
+        //修改浪潮企业状态
         String lcUserToken=redisCache.getCacheObject(CacheConstants.LC_JGD_TOKEN+appUser.getLcUserid());
         if(StringUtils.isBlank(lcUserToken)){
             throw new RuntimeException("token已失效");
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index ae700ba..34eed87 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppUserVo">
-        select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,lc_userid,email,resume_status,nation,openid,unionid,address,domicile_address,user_type,experience,ytj_password from app_user
+        select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,lc_userid,email,resume_status,nation,openid,unionid,address,domicile_address,user_type,experience,ytj_password from app_user au
     </sql>
 
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
@@ -70,6 +70,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null  and idCard != ''"> and id_card like concat('%', CAST(#{idCard} AS VARCHAR), '%')</if>
             <if test="userId != null"> and user_id = #{userId}</if>
             <if test="isCompanyUser">and is_company_user =#{isCompanyUser}</if>
+            <if test="jobTitleId != null  and jobTitleId != ''"> and job_title_id like concat('%', CAST(#{jobTitleId} AS VARCHAR), '%')</if>
+            <if test="userType != null  and userType != ''"> and user_type like concat('%', CAST(#{userType} AS VARCHAR), '%')</if>
+            <if test="workExperience!=null and workExperience!=''">and work_experience =#{workExperience}</if>
+            <if test="finishTime != null and finishTime != ''"> and update_time &gt;= #{finishTime}</if>
+            <if test="schoolName != null and schoolName != ''">
+                AND EXISTS (
+                SELECT 1 FROM app_user_education edu
+                WHERE edu.user_id = au.user_id AND edu.del_flag = '0' AND edu.school_name = #{schoolName}
+                )
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND EXISTS (
+                SELECT 1 FROM app_user_education edu
+                WHERE edu.user_id = au.user_id AND edu.del_flag = '0' AND edu.end_time = #{endTime}
+                )
+            </if>
         </where>
     </select>
     <select id="selectByJobId" resultType="com.ruoyi.common.core.domain.entity.AppUser" parameterType="java.lang.Long">
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index 91c2f54..dcced9a 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -186,11 +186,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update COMPANY set company_status=#{companyStatus},update_time=#{updateTime},update_by=#{updateBy} where company_id=#{companyId} and del_flag='0'
     </update>
 
+    <update id="updateLcToLocalStatus" parameterType="Company">
+        UPDATE company cn
+        SET cn.status = #{status},cn.update_time = #{updateTime},cn.update_by = #{updateBy}
+        WHERE cn.code IN ( SELECT su.id_card FROM sys_user su WHERE su.user_id = #{userId})
+          AND cn.del_flag = '0'
+    </update>
+
     <select id="selectAdminCompanyList" parameterType="CompanySearch" resultMap="CompanyResult">
         select t.company_id, t.name, t.location, t.industry, t.scale, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.remark,t.code,t.description,
                t.nature,t.company_nature,t.total_recruitment,t.registered_address,t.contact_person,t.contact_person_phone,t.is_abnormal,t.not_pass_reason,t.status,case when t.status='2'
                then t.update_time else null end reject_time,t.is_imp_company,t.imp_company_type,t.enterprise_type,t.legal_person,t.legal_id_card,t.legal_phone,t.is_hrs,
-               su.lc_userid,cct.contact_person as con_contact_person,cct.contact_person_phone as con_contact_person_phone,cct.company_id as con_company_id from company t
+               su.lc_userid,su.user_id,cct.contact_person as con_contact_person,cct.contact_person_phone as con_contact_person_phone,cct.company_id as con_company_id from company t
         left join sys_user su on t.code=su.id_card and su.del_flag='0'
         left join company_contact cct on t.company_id=cct.company_id and cct.del_flag='0'
         <where>  t.del_flag = '0' and su.lc_userid is not null