个人简历逻辑添加

vetti-admin/src/main/java/com/vetti/socket/ChatWebSocketHandler.java

@@ -171,7 +171,7 @@ public class ChatWebSocketHandler {
                         }
                         Map<String,String> mapEntity = new HashMap<>();
                         mapEntity.put("role","system");
-                        mapEntity.put("content","You are an interviewer. Generate follow-up questions based on Construction Labourer candidate responses.");
+                        mapEntity.put("content","You are an interviewer. Generate follow-up questions based on Construction Labourer candidate responses.Return Only One Question");
                         List<Map<String,String>> list = new LinkedList();
                         list.add(mapEntity);
                         promptJson = JSONUtil.toJsonStr(list);
@@ -252,7 +252,7 @@ public class ChatWebSocketHandler {
                                     List<Map> list = JSONUtil.toList(msgMapData, Map.class);
                                     Map<String,String> mapEntity = new HashMap<>();
                                     mapEntity.put("role","user");
-                                    mapEntity.put("content","问题："+questionResult+"\\n候选人回答：{}");
+                                    mapEntity.put("content","Question："+questionResult+"\\nCandidate Answer：{}");
                                     list.add(mapEntity);
                                     cacheMsgMapData.put(session.getId(),JSONUtil.toJsonStr(list));
                                 }

vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeCvInfoController.java

@@ -0,0 +1,99 @@
+package com.vetti.web.controller.hotake;
+
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.R;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.hotake.domain.HotakeCvInfo;
+import com.vetti.hotake.service.IHotakeCvInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 简历信息Controller
+ * 
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+@Api(tags ="简历信息")
+@RestController
+@RequestMapping("/hotake/cvInfo")
+public class HotakeCvInfoController extends BaseController
+{
+    @Autowired
+    private IHotakeCvInfoService hotakeCvInfoService;
+
+    /**
+     * 查询简历信息列表
+     */
+    @ApiOperation("查询简历信息列表(分页)")
+    @GetMapping("/getPagelist")
+    public TableDataInfo list(HotakeCvInfo hotakeCvInfo)
+    {
+        startPage();
+        List<HotakeCvInfo> list = hotakeCvInfoService.selectHotakeCvInfoList(hotakeCvInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询简历信息列表
+     */
+    @ApiOperation("查询简历信息列表(无分页)")
+    @GetMapping("/getList")
+    public R<List<HotakeCvInfo>> getList(HotakeCvInfo hotakeCvInfo)
+    {
+        List<HotakeCvInfo> list = hotakeCvInfoService.selectHotakeCvInfoList(hotakeCvInfo);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取简历信息详细信息
+     */
+    @ApiOperation("获取简历信息详细信息")
+    @GetMapping(value = "/{id}")
+    public R<HotakeCvInfo> getInfo(@PathVariable("id") Long id)
+    {
+        return R.ok(hotakeCvInfoService.selectHotakeCvInfoById(id));
+    }
+
+    /**
+     * 新增简历信息
+     */
+    @ApiOperation("新增简历信息")
+    @Log(title = "简历信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R add(@RequestBody HotakeCvInfo hotakeCvInfo)
+    {
+        return R.ok(hotakeCvInfoService.insertHotakeCvInfo(hotakeCvInfo));
+    }
+
+    /**
+     * 修改简历信息
+     */
+    @ApiOperation("修改简历信息")
+    @Log(title = "简历信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R edit(@RequestBody HotakeCvInfo hotakeCvInfo)
+    {
+        return R.ok(hotakeCvInfoService.updateHotakeCvInfo(hotakeCvInfo));
+    }
+
+    /**
+     * 删除简历信息
+     */
+    @ApiOperation("删除简历信息")
+    @Log(title = "简历信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{id}")
+    public R remove(@PathVariable Long id)
+    {
+        return R.ok(hotakeCvInfoService.deleteHotakeCvInfoById(id));
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java

@@ -1,10 +1,15 @@
 package com.vetti.web.controller.system;
 
+import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
 import com.vetti.common.core.domain.R;
 import com.vetti.common.enums.UserOperStepsEnum;
+import com.vetti.hotake.domain.HotakeCvInfo;
+import com.vetti.hotake.service.IHotakeCvInfoService;
+import com.vetti.web.entity.dto.SysUserDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,19 +53,27 @@ public class SysProfileController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private IHotakeCvInfoService cvInfoService;
+
     /**
      * 个人信息
      */
     @ApiOperation("个人信息")
     @GetMapping("/personalInfo")
-    public R<SysUser> profile()
+    public R<SysUserDto> profile()
     {
+        SysUserDto dto =new SysUserDto();
         LoginUser loginUser = getLoginUser();
         SysUser user = userService.selectUserById(loginUser.getUserId());
-        R r = R.ok(user);
+        BeanUtil.copyProperties(user,dto);
+        HotakeCvInfo query = new  HotakeCvInfo();
+        query.setUserId(user.getUserId());
+        List<HotakeCvInfo> cvInfoList = cvInfoService.selectHotakeCvInfoList(query);
+        dto.setCvInfoList(cvInfoList);
 //        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
 //        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return r;
+        return R.ok(dto);
     }
 
 

vetti-admin/src/main/java/com/vetti/web/entity/dto/SysUserDto.java

@@ -0,0 +1,23 @@
+package com.vetti.web.entity.dto;
+
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.hotake.domain.HotakeCvInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 用户信息对象
+ *
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+@Data
+@Accessors(chain = true)
+public class SysUserDto extends SysUser {
+
+    @ApiModelProperty("简历数据集合")
+    private List<HotakeCvInfo> cvInfoList;
+}

vetti-common/src/main/java/com/vetti/common/core/domain/dto/UserBestSideDto.java

@@ -17,4 +17,7 @@ public class UserBestSideDto {
     @ApiModelProperty("个人展示的链接地址")
     private String linkAddress;
 
+    @ApiModelProperty("链接数据类型")
+    private String linkDataType;
+
 }

vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeCvInfo.java

@@ -0,0 +1,49 @@
+package com.vetti.hotake.domain;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModelProperty;
+import com.vetti.common.annotation.Excel;
+import com.vetti.common.core.domain.BaseEntity;
+
+/**
+ * 简历信息对象 hotake_cv_info
+ *
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+@Data
+@Accessors(chain = true)
+public class HotakeCvInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    @ApiModelProperty("主键ID")
+    private Long id;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 简历名称 */
+    @ApiModelProperty("简历名称")
+    @Excel(name = "简历名称")
+    private String cvName;
+
+    /** 简历类型（如：image/jpeg, application/pdf等） */
+    @ApiModelProperty("简历类型(doc/pdf)")
+    private String cvFileType;
+
+    /** 简历地址 */
+    @ApiModelProperty("简历地址")
+    @Excel(name = "简历地址")
+    private String cvUrl;
+
+    /** 状态（0 禁用，1 启用） */
+    @ApiModelProperty("状态（0 禁用，1 启用）")
+    @Excel(name = "状态", readConverterExp = "0=,禁=用，1,启=用")
+    private String status;
+
+}

vetti-hotakes/src/main/java/com/vetti/hotake/mapper/HotakeCvInfoMapper.java

@@ -0,0 +1,69 @@
+package com.vetti.hotake.mapper;
+
+import java.util.List;
+import com.vetti.hotake.domain.HotakeCvInfo;
+
+/**
+ * 简历信息Mapper接口
+ * 
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+public interface HotakeCvInfoMapper 
+{
+    /**
+     * 查询简历信息
+     * 
+     * @param id 简历信息主键
+     * @return 简历信息
+     */
+    public HotakeCvInfo selectHotakeCvInfoById(Long id);
+
+    /**
+     * 查询简历信息列表
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 简历信息集合
+     */
+    public List<HotakeCvInfo> selectHotakeCvInfoList(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 新增简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    public int insertHotakeCvInfo(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 修改简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    public int updateHotakeCvInfo(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 删除简历信息
+     * 
+     * @param id 简历信息主键
+     * @return 结果
+     */
+    public int deleteHotakeCvInfoById(Long id);
+
+    /**
+     * 批量删除简历信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHotakeCvInfoByIds(Long[] ids);
+    /**
+     * 批量新增简历信息
+     *
+     * @param hotakeCvInfoList 简历信息列表
+     * @return 结果
+     */
+    public int batchInsertHotakeCvInfo(List<HotakeCvInfo> hotakeCvInfoList);
+
+}

vetti-hotakes/src/main/java/com/vetti/hotake/service/IHotakeCvInfoService.java

@@ -0,0 +1,70 @@
+package com.vetti.hotake.service;
+
+import java.util.List;
+import com.vetti.hotake.domain.HotakeCvInfo;
+
+/**
+ * 简历信息Service接口
+ * 
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+public interface IHotakeCvInfoService 
+{
+    /**
+     * 查询简历信息
+     * 
+     * @param id 简历信息主键
+     * @return 简历信息
+     */
+    public HotakeCvInfo selectHotakeCvInfoById(Long id);
+
+    /**
+     * 查询简历信息列表
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 简历信息集合
+     */
+    public List<HotakeCvInfo> selectHotakeCvInfoList(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 新增简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    public int insertHotakeCvInfo(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 修改简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    public int updateHotakeCvInfo(HotakeCvInfo hotakeCvInfo);
+
+    /**
+     * 批量删除简历信息
+     * 
+     * @param ids 需要删除的简历信息主键集合
+     * @return 结果
+     */
+    public int deleteHotakeCvInfoByIds(Long[] ids);
+
+    /**
+     * 删除简历信息信息
+     * 
+     * @param id 简历信息主键
+     * @return 结果
+     */
+    public int deleteHotakeCvInfoById(Long id);
+
+    /**
+     * 批量新增简历信息
+     *
+     * @param hotakeCvInfoList 简历信息列表
+     * @return 结果
+     */
+    public int batchInsertHotakeCvInfo(List<HotakeCvInfo> hotakeCvInfoList);
+
+}

vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeCvInfoServiceImpl.java

@@ -0,0 +1,118 @@
+package com.vetti.hotake.service.impl;
+
+import java.util.List;
+
+import com.vetti.common.core.service.BaseServiceImpl;
+import com.vetti.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.vetti.hotake.mapper.HotakeCvInfoMapper;
+import com.vetti.hotake.domain.HotakeCvInfo;
+import com.vetti.hotake.service.IHotakeCvInfoService;
+
+/**
+ * 简历信息Service业务层处理
+ * 
+ * @author wangxiangshun
+ * @date 2025-11-02
+ */
+@SuppressWarnings("all")
+@Service
+public class HotakeCvInfoServiceImpl extends BaseServiceImpl implements IHotakeCvInfoService
+{
+    @Autowired
+    private HotakeCvInfoMapper hotakeCvInfoMapper;
+
+    /**
+     * 查询简历信息
+     * 
+     * @param id 简历信息主键
+     * @return 简历信息
+     */
+    @Transactional(readOnly = true)
+    @Override
+    public HotakeCvInfo selectHotakeCvInfoById(Long id)
+    {
+        return hotakeCvInfoMapper.selectHotakeCvInfoById(id);
+    }
+
+    /**
+     * 查询简历信息列表
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 简历信息
+     */
+    @Transactional(readOnly = true)
+    @Override
+    public List<HotakeCvInfo> selectHotakeCvInfoList(HotakeCvInfo hotakeCvInfo)
+    {
+        return hotakeCvInfoMapper.selectHotakeCvInfoList(hotakeCvInfo);
+    }
+
+    /**
+     * 新增简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public int insertHotakeCvInfo(HotakeCvInfo hotakeCvInfo)
+    {
+        hotakeCvInfo.setCreateTime(DateUtils.getNowDate());
+        return hotakeCvInfoMapper.insertHotakeCvInfo(hotakeCvInfo);
+    }
+
+    /**
+     * 修改简历信息
+     * 
+     * @param hotakeCvInfo 简历信息
+     * @return 结果
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public int updateHotakeCvInfo(HotakeCvInfo hotakeCvInfo)
+    {
+        hotakeCvInfo.setUpdateTime(DateUtils.getNowDate());
+        return hotakeCvInfoMapper.updateHotakeCvInfo(hotakeCvInfo);
+    }
+
+    /**
+     * 批量删除简历信息
+     * 
+     * @param ids 需要删除的简历信息主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public int deleteHotakeCvInfoByIds(Long[] ids)
+    {
+        return hotakeCvInfoMapper.deleteHotakeCvInfoByIds(ids);
+    }
+
+    /**
+     * 删除简历信息信息
+     * 
+     * @param id 简历信息主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public int deleteHotakeCvInfoById(Long id)
+    {
+        return hotakeCvInfoMapper.deleteHotakeCvInfoById(id);
+    }
+    /**
+     * 批量新增简历信息
+     *
+     * @param hotakeCvInfoList 简历信息列表
+     * @return 结果
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public int batchInsertHotakeCvInfo(List<HotakeCvInfo> hotakeCvInfoList){
+        return hotakeCvInfoMapper.batchInsertHotakeCvInfo(hotakeCvInfoList);
+    }
+}

vetti-hotakes/src/main/resources/mapper/hotake/HotakeCvInfoMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vetti.hotake.mapper.HotakeCvInfoMapper">
+    
+    <resultMap type="HotakeCvInfo" id="HotakeCvInfoResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="cvName"    column="cv_name"    />
+        <result property="cvFileType"    column="cv_file_type"    />
+        <result property="cvUrl"    column="cv_url"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"            column="del_flag"              />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectHotakeCvInfoVo">
+        select id, user_id, cv_name, cv_file_type, cv_url, status, del_flag, create_by, create_time, update_by, update_time, remark from hotake_cv_info
+    </sql>
+
+    <select id="selectHotakeCvInfoList" parameterType="HotakeCvInfo" resultMap="HotakeCvInfoResult">
+        <include refid="selectHotakeCvInfoVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="cvName != null  and cvName != ''"> and cv_name like concat('%', #{cvName}, '%')</if>
+            <if test="cvFileType != null  and cvFileType != ''"> and cv_file_type = #{cvFileType}</if>
+            <if test="cvUrl != null  and cvUrl != ''"> and cv_url = #{cvUrl}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectHotakeCvInfoById" parameterType="Long" resultMap="HotakeCvInfoResult">
+        <include refid="selectHotakeCvInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertHotakeCvInfo" parameterType="HotakeCvInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into hotake_cv_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="cvName != null">cv_name,</if>
+            <if test="cvFileType != null">cv_file_type,</if>
+            <if test="cvUrl != null">cv_url,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="cvName != null">#{cvName},</if>
+            <if test="cvFileType != null">#{cvFileType},</if>
+            <if test="cvUrl != null">#{cvUrl},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateHotakeCvInfo" parameterType="HotakeCvInfo">
+        update hotake_cv_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="cvName != null">cv_name = #{cvName},</if>
+            <if test="cvFileType != null">cv_file_type = #{cvFileType},</if>
+            <if test="cvUrl != null">cv_url = #{cvUrl},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteHotakeCvInfoById" parameterType="Long">
+        delete from hotake_cv_info where id = #{id}
+    </delete>
+
+    <delete id="deleteHotakeCvInfoByIds" parameterType="String">
+        delete from hotake_cv_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <insert id="batchInsertHotakeCvInfo">
+        insert into hotake_cv_info( id, user_id, cv_name, cv_file_type, cv_url, status, del_flag, create_by, create_time, update_by, update_time, remark) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.userId}, #{item.cvName}, #{item.cvFileType}, #{item.cvUrl}, #{item.status}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+        </foreach>
+    </insert>
+</mapper>

vetti-system/target/classes/mapper/system/SysUserMapper.xml

@@ -35,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="relocate" column="relocate" />
 		<result property="bestSideJson" column="best_side_json" />
 
+		<result property="address" column="address" />
+		<result property="userFlag" column="user_flag" />
+
 
         <association property="dept"     javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
@@ -63,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, 
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.sys_user_type
-		,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json
+		,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
@@ -72,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-		       d.dept_name, d.leader,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json from sys_user u
+		       d.dept_name, d.leader,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -105,7 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,
-	                    u.create_time,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json
+	                    u.create_time,u.sys_user_type,u.steps,u.job_position,u.experience,u.cv_url,u.location,
+	                    u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -123,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.sys_user_type,
-	                    u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json
+	                    u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json,u.address,u.user_flag
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -187,6 +191,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="jobType != null and jobType != ''">job_type,</if>
 		<if test="relocate != null and relocate != ''">relocate,</if>
 		<if test="bestSideJson != null and bestSideJson != ''">best_side_json,</if>
+		<if test="address != null and address != ''">address,</if>
+		<if test="userFlag != null and userFlag != ''">user_flag,</if>
 
  			create_time
  		)values(
@@ -213,6 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="jobType != null and jobType != ''">#{jobType},</if>
 		<if test="relocate != null and relocate != ''">#{relocate},</if>
 		<if test="bestSideJson != null and bestSideJson != ''">#{bestSideJson},</if>
+		<if test="address != null and address != ''">#{address},</if>
+		<if test="userFlag != null and userFlag != ''">#{userFlag},</if>
 
  			sysdate()
  		)
@@ -243,6 +251,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="jobType != null and jobType != ''">job_type = #{jobType},</if>
 			<if test="relocate != null and relocate != ''">relocate = #{relocate},</if>
 			<if test="bestSideJson != null and bestSideJson != ''">best_side_json = #{bestSideJson},</if>
+			<if test="address != null and address != ''">address = #{address},</if>
+			<if test="userFlag != null and userFlag != ''">user_flag = #{userFlag},</if>
 
  			update_time = sysdate()
  		</set>