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 @@ + + @@ -37,9 +39,11 @@ 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 @@ -62,6 +66,15 @@ and t.handle_user_id = #{handleUserId} + + and ca.name like '%' || #{companyName} || '%' + + + and j.job_title like '%' || #{jobTitle} || '%' + + + and u.name like '%' || #{name} || '%' + order by t.create_time desc