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 23a2321..a08424c 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
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.cms.domain.vo.AppUserLky;
 import com.ruoyi.cms.util.RoleUtils;
 import com.ruoyi.common.annotation.BussinessLog;
+import com.ruoyi.common.core.domain.entity.AppUserShow;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -48,7 +49,7 @@ public class CmsAppUserController extends BaseController
      * 查询APP用户列表
      */
     @ApiOperation("查询APP用户列表")
-//    @PreAuthorize("@ss.hasPermi('cms:appUser:list')")
+    @PreAuthorize("@ss.hasPermi('cms:appUser:list')")
     @GetMapping("/list")
     public TableDataInfo list(AppUser appUser)
     {
@@ -187,4 +188,14 @@ public class CmsAppUserController extends BaseController
         AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser);
         return AjaxResult.success(appUserLky);
     }
+
+    @ApiOperation("查询APP申请用户列表")
+    //@PreAuthorize("@ss.hasPermi('cms:appUser:userApplyList')")
+    @GetMapping("/userApplyList")
+    public TableDataInfo userApplyList(AppUser appUser)
+    {
+        startPage();
+        List<AppUserShow> list = appUserService.selectUserApplyList(appUser);
+        return getDataTable(list);
+    }
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java
index c34af0b..3705f9f 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java
@@ -6,6 +6,7 @@ import com.ruoyi.cms.domain.vo.CandidateVO;
 import com.ruoyi.cms.service.IAppUserService;
 import com.ruoyi.cms.service.IJobApplyService;
 import com.ruoyi.cms.util.RoleUtils;
+import com.ruoyi.cms.util.StringUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -92,4 +93,22 @@ public class JobApplyController extends BaseController {
         }
         return success(iJobApplyService.applyComJob(jobApply));
     }
+
+    @Log(title = "岗位", businessType = BusinessType.UPDATE)
+    @ApiOperation("求职者管理-用户列表录用")
+    @PutMapping("/applyAgree")
+    public AjaxResult applyAgree(@RequestBody JobApply jobApply)
+    {
+        if(jobApply.getJobId()==null){
+            return AjaxResult.error("岗位id为空");
+        }
+        if(jobApply.getUserId()==null){
+            return AjaxResult.error("用户id为空!");
+        }
+        jobApply.setHire(StringUtil.HIRE_LY);
+        jobApply.setHireSource(StringUtil.HIRE_SOURCE_SYSTEM);
+        return success(iJobApplyService.applyComJob(jobApply));
+    }
+
+
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java
index d3b964f..6bcfddf 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java
@@ -40,4 +40,7 @@ public class JobApply extends BaseEntity
 
     @ApiModelProperty("是否录用 0录用 2或null未录用")
     private String hire;
+
+    @ApiModelProperty("录用来源 0本系统 1招聘会")
+    private String hireSource;
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java
index e404458..fa69bb7 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.core.domain.entity.AppUserShow;
 import com.ruoyi.common.core.domain.entity.MyChart;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -34,4 +35,6 @@ public interface AppUserMapper extends BaseMapper<AppUser>
     MyChart getMyTj(Long userId);
 
     SysUser selectSysUserIdcard(String idCard);
+
+    List<AppUserShow> selectUserApplyList(AppUser appUser);
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
index dcb34d0..3801d2e 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
@@ -2,6 +2,7 @@ package com.ruoyi.cms.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.AppUserShow;
 import com.ruoyi.common.core.domain.entity.MyChart;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.cms.domain.vo.AppUserLky;
@@ -72,4 +73,6 @@ public interface IAppUserService
     public List<AppUser> selectNoTmAppUserList(AppUser appUser);
 
     public MyChart getMyTj(Long userId);
+
+    public List<AppUserShow> selectUserApplyList(AppUser appUser);
 }
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 b6bcc03..e896b8e 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
@@ -97,14 +97,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     @Override
     public List<AppUser> selectAppUserList(AppUser appUser)
     {
-        List<AppUser> list=appUserMapper.selectAppUserList(appUser);
-        if(list!=null){
-            //身份证脱敏处理
-            list.forEach(x->{
-                x.setIdCard(StringUtil.desensitizeIdCard(x.getIdCard()));
-            });
-        }
-        return list;
+        return appUserMapper.selectAppUserList(appUser);
     }
 
     /**
@@ -388,4 +381,16 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     public MyChart getMyTj(Long userId) {
         return appUserMapper.getMyTj(userId);
     }
+
+    @Override
+    public List<AppUserShow> selectUserApplyList(AppUser appUser) {
+        List<AppUserShow> list=appUserMapper.selectUserApplyList(appUser);
+        if(list!=null){
+            //身份证脱敏处理
+            list.forEach(x->{
+                x.setIdCard(StringUtil.desensitizeIdCard(x.getIdCard()));
+            });
+        }
+        return list;
+    }
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java
index bc58237..da2add3 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java
@@ -9,6 +9,7 @@ import com.ruoyi.cms.mapper.JobApplyMapper;
 import com.ruoyi.cms.mapper.JobMapper;
 import com.ruoyi.cms.mapper.NoticeMapper;
 import com.ruoyi.cms.service.EmployeeConfirmService;
+import com.ruoyi.cms.util.StringUtil;
 import com.ruoyi.cms.util.notice.NoticeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,7 +41,8 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService {
         if(t>0){
             JobApply apply=new JobApply();
             apply.setId(employeeConfirm.getApplyId());
-            apply.setHire("0");
+            apply.setHire(StringUtil.HIRE_LY);
+            apply.setHireSource(StringUtil.HIRE_SOURCE_SYSTEM);//本系统录用
             jobApplyMapper.updateById(apply);
         }
         Job job=jobMapper.getJobInfo(employeeConfirm.getJobId());
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java
index b8637b5..fc53803 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java
@@ -35,6 +35,20 @@ public class StringUtil {
      */
     public static final String BASE_WW_GW="http://http://222.80.110.161:11111/kashi/job-portal/detail/:";
 
+    /**
+     *录用
+     */
+    public static final String HIRE_LY="0";
+
+    /**
+     *录用-系统
+     */
+    public static final String HIRE_SOURCE_SYSTEM="0";
+    /**
+     *录用-招聘会
+     */
+    public static final String HIRE_SOURCE_ZPH="1";
+
     public static Boolean isEmptyOrNull(String s){
         if(Objects.isNull(s)){return true;}
         return s.isEmpty();
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index 6209cc2..9f9165b 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -123,4 +123,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
     </select>
 
+    <select id="selectUserApplyList" parameterType="AppUser" resultType="com.ruoyi.common.core.domain.entity.AppUserShow">
+        select a.user_id , a.name , a.age , a.sex , get_birth_date_from_id_card ( a.id_card ) as birth_date ,
+        a.education , a.political_affiliation , a.phone , a.avatar , c.min_salary salaryMin ,c.max_salary salaryMax,a.area ,a.id_card ,
+        b.job_id ,c.job_title,e.name as company_name,b.hire,b.hire_source,b.create_time,e.company_id
+        from app_user a
+        inner join job_apply b on  a.user_id = b.user_id and a.del_flag = '0' and b.del_flag = '0'
+        INNER join job c on b.job_id=c.job_id and c.del_flag='0'
+        INNER join company e on c.company_id=e.company_id and e.del_flag='0'
+        <where>
+            <if test="name != null  and name != ''"> and a.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')</if>
+            <if test="birthDate != null "> and a.birth_date = #{birthDate}</if>
+            <if test="education != null  and education != ''"> and a.education = #{education}</if>
+            <if test="politicalAffiliation != null  and politicalAffiliation != ''"> and a.political_affiliation = #{politicalAffiliation}</if>
+            <if test="phone != null  and phone != ''"> and a.phone = #{phone}</if>
+            <if test="idCard != null  and idCard != ''"> and a.id_card like concat('%', CAST(#{idCard} AS VARCHAR), '%')</if>
+            <if test="userId != null"> and a.user_id = #{userId}</if>
+        </where>
+        order by b.create_time desc
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserShow.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserShow.java
new file mode 100644
index 0000000..493b625
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserShow.java
@@ -0,0 +1,145 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * APP用户对象 app_user
+ * @author lishundong
+ * @date 2024-09-03
+ */
+@Data
+@ApiModel("APP用户Show")
+public class AppUserShow extends BaseEntity
+{
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "user_id",type = IdType.AUTO)
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    @Excel(name = "用户名称")
+    @ApiModelProperty("用户名称")
+    private String name;
+
+    @Excel(name = "年龄段 对应字典age")
+    @ApiModelProperty("年龄段 对应字典age")
+    private String age;
+
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女")
+    @ApiModelProperty("用户性别（0男 1女）对应字典sex")
+    private String sex;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("生日")
+    private LocalDate birthDate;
+
+    @Excel(name = "学历 对应字典education")
+    @ApiModelProperty("学历 对应字典education")
+    private String education;
+
+    @Excel(name = "政治面貌")
+    @ApiModelProperty("政治面貌")
+    private String politicalAffiliation;
+
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String phone;
+
+    @Excel(name = "头像地址")
+    @ApiModelProperty("头像地址")
+    private String avatar;
+
+    @Excel(name = "最低工资")
+    @ApiModelProperty("最低工资")
+    private String salaryMin;
+
+    @Excel(name = "最高工资")
+    @ApiModelProperty("最高工资")
+    private String salaryMax;
+
+    @Excel(name = "期望工作地 对应字典area")
+    @ApiModelProperty("期望工作地 对应字典area")
+    private String area;
+
+    @ApiModelProperty("期望岗位,逗号分隔")
+    private String jobTitleId;
+
+    @ApiModelProperty("期望薪资")
+    private String experience;
+
+    @ApiModelProperty("是否开启推荐（0不推荐 1推荐）")
+    private Integer isRecommend;
+
+    @ApiModelProperty("身份证")
+    private String idCard;
+
+    /**
+     * 是否企业用户 0是，1否改为（0企业，1求职者，2网格员）
+     */
+    @ApiModelProperty("app角色：0企业，1求职者，2网格员 3内部政府人员")
+    private String isCompanyUser;
+
+    @ApiModelProperty("民族")
+    private String nation;
+
+    @ApiModelProperty("工作经验")
+    private String workExperience;
+
+    @TableField(exist = false)
+    @ApiModelProperty("工作经历列表")
+    private List<UserWorkExperiences> experiencesList;
+
+    @TableField(exist = false)
+    @ApiModelProperty("技能列表")
+    private List<AppSkill> appSkillsList;
+
+    @TableField(exist = false)
+    @ApiModelProperty("附件列表")
+    private List<File> fileList;
+
+    @ApiModelProperty("一体机密码")
+    private String ytjPassword;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("户籍地址")
+    private String domicileAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty("录用来源 0本系统，1招聘会")
+    private String hireSource;
+
+    @TableField(exist = false)
+    @ApiModelProperty("录用状态0 2或null未录用")
+    private String hire;
+
+    @TableField(exist = false)
+    @ApiModelProperty("企业名称")
+    private String companyName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("企业id")
+    private String companyId;
+
+    @TableField(exist = false)
+    @ApiModelProperty("岗位名称")
+    private String jobTitle;
+
+    @TableField(exist = false)
+    @ApiModelProperty("岗位id")
+    private String jobId;
+}