From 1027530803e0d0e5ce7bb4abae392750d478deb7 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Fri, 10 Jul 2026 16:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E4=BC=81=E4=B8=9A=E5=92=8C=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/cms/CmsAppUserController.java  |  2 +-
 .../com/ruoyi/cms/domain/AppUserJobComplaint.java |  4 ++++
 .../mapper/app/AppUserJobComplaintMapper.xml      | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
index 8ab995a..b3b0b21 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
@@ -333,6 +333,6 @@ public class CmsAppUserController extends BaseController
         }
         appUser.setLcUserid(SecurityUtils.getlcUserid());
         appUserService.changeLcCompanyStatus(appUser);
-        return success("密码重置成功");
+        return success("操作成功!");
     }
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserJobComplaint.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserJobComplaint.java
index cf45e00..5317027 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserJobComplaint.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserJobComplaint.java
@@ -74,4 +74,8 @@ public class AppUserJobComplaint extends BaseEntity {
     private String jobTitle;
     @TableField(exist = false)
     private String name;
+    @TableField(exist = false)
+    private String jobStatus;
+    @TableField(exist = false)
+    private String companyStatus;
 }
\ No newline at end of file
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserJobComplaintMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserJobComplaintMapper.xml
index 58664c6..ad8ac5b 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserJobComplaintMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserJobComplaintMapper.xml
@@ -25,6 +25,8 @@
         <result column="company_name" property="companyName"/>
         <result column="job_title" property="jobTitle"/>
         <result column="name" property="name"/>
+        <result column="job_status" property="jobStatus"/>
+        <result column="company_status" property="companyStatus"/>
     </resultMap>
 
     <sql id="selectAppUserJobComplaintVo">
@@ -37,9 +39,11 @@
     <sql id="selectAppUserInfoJobComplaintVo">
         select t.id, t.user_id, t.job_id, t.complaint_type, t.complaint_content, t.evidence_url, t.contact_phone,
                t.complaint_status, t.handle_user_id, t.handle_content, t.handle_time, t.del_flag,
-               t.create_by, t.create_time, t.update_by, t.update_time, t.remark,j.job_title,j.company_name,j.company_id,u.name
+               t.create_by, t.create_time, t.update_by, t.update_time, t.remark,j.job_title,j.company_name,
+               j.company_id,j.job_status,u.name,ca.company_status
         from app_user_job_complaint t
          LEFT JOIN job j ON t.job_id = j.job_id
+         LEFT JOIN company ca ON ca.company_id = j.company_id
          LEFT JOIN app_user u ON t.user_id = u.user_id
     </sql>
 
@@ -62,6 +66,15 @@
             <if test="handleUserId != null">
                 and t.handle_user_id = #{handleUserId}
             </if>
+            <if test="companyName != null and companyName!='' ">
+                and ca.name like '%' || #{companyName} || '%'
+            </if>
+            <if test="jobTitle != null and jobTitle!='' ">
+                and j.job_title like '%' || #{jobTitle} || '%'
+            </if>
+            <if test="name != null and name!='' ">
+                and u.name like '%' || #{name} || '%'
+            </if>
         </where>
         order by t.create_time desc
     </select>