diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java
index e3837c3..7db63a3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java
@@ -1,7 +1,9 @@
 package com.ruoyi.web.controller.system;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.TdQuestion;
 import com.ruoyi.system.service.ITdQuestionService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -46,7 +48,6 @@ public class TdExamController extends BaseController{
     public TableDataInfo list(TdQuestion tdQuestion)
     {
         startPage();
-
         List<TdQuestion> list = tdQuestionService.selectTdQuestionList(tdQuestion);
         return getDataTable(list);
     }
@@ -54,6 +55,7 @@ public class TdExamController extends BaseController{
     /**
      * 访问考试界面，点击开始答题，重定向到exam页面
      */
+    @Log(title = "涉密考试", businessType = BusinessType.EXAM)
     @GetMapping("/edit")
     public String index(){
         return prefix + "/exam";
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
index 6919bb9..c3cd768 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
@@ -5,6 +5,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +20,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 考试结果Controller
  * 
@@ -84,21 +87,21 @@ public class TdExamnumController extends BaseController
     @Log(title = "考试结果", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSaveNew(TdExamnum tdExamnum)
+    public AjaxResult addSave(TdExamnum tdExamnum)
     {
         return toAjax(tdExamnumService.insertTdExamnum(tdExamnum));
     }
 
     /**
-     * 新增保存考试结果
+     * 修改考试结果
      */
-    @RequiresPermissions("system:examnum:add")
-    @Log(title = "考试结果", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(TdExamnum tdExamnum)
+    @RequiresPermissions("system:examnum:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
-        return toAjax(tdExamnumService.insertTdExamnum(tdExamnum));
+        TdExamnum tdExamnum = tdExamnumService.selectTdExamnumById(id);
+        mmap.put("tdExamnum", tdExamnum);
+        return prefix + "/edit";
     }
 
     /**
@@ -113,4 +116,27 @@ public class TdExamnumController extends BaseController
         return toAjax(tdExamnumService.updateTdExamnum(tdExamnum));
     }
 
+    /**
+     * 删除考试结果
+     */
+    @RequiresPermissions("system:examnum:remove")
+    @Log(title = "考试结果", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdExamnumService.deleteTdExamnumByIds(ids));
+    }
+
+    /**
+     * 将前端的考试结果进行保存
+     * @param
+     */
+    // 新增提交
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSaveExamnum(@Validated TdExamnum tdExamnum)
+    {
+        return toAjax(tdExamnumService.insertTdExamnum(tdExamnum));
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index fa5b522..9344dc2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -124,6 +124,69 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">用户地区：</label>
+                <div class="col-sm-8">
+                    <input name="userarea" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">民族：</label>
+                <div class="col-sm-8">
+                    <select name="nation" class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">出生年月：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="birthday" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">政治面貌：</label>
+                <div class="col-sm-8">
+                    <select name="politics" class="form-control m-b" th:with="type=${@dict.getType('sys_user_politics')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">涉密程度：</label>
+                <div class="col-sm-8">
+                    <select name="shemichengdu" class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">学历：</label>
+                <div class="col-sm-8">
+                    <input name="graduate" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">生效时间：</label>
+                <div class="col-sm-8">
+                    <input name="startdata" class="form-control"      type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">失效时间：</label>
+                <div class="col-sm-8">
+                    <input name="enddata" class="form-control" value="2050-12-31" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">健康状况：</label>
+                <div class="col-sm-8">
+                    <input name="helthy" class="form-control" type="text">
+                </div>
+            </div>
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -210,8 +273,13 @@
             },
             focusCleanup: true
         });
-        
+        $("input[name='birthday']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
         function submitHandler() {
+
         	var chrtype = [[${#strings.defaultString(@config.getKey('sys.account.chrtype'), 0)}]];
 			var password = $("#password").val();
 	        if ($.validate.form() && checkpwd(chrtype, password)) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 255239e..343ede9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -110,6 +110,8 @@
                     </div>
                 </div>
             </div>
+
+
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -213,6 +215,11 @@
    			$("#treeName").val(body.find('#treeName').val());
    			$.modal.close(index);
 		}
+        $("input[name='birthday']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
 
 		$(function() {
             $('#post').select2({
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 763aab5..3bba984 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,10 +1,11 @@
 package com.ruoyi.common.core.domain.entity;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -86,6 +87,115 @@ public class SysUser extends BaseEntity
     /** 密码最后更新时间 */
     private Date pwdUpdateDate;
 
+    /** 用户地区 */
+    @Excel(name = "用户地区")
+    private String userarea;
+
+    /** 民族 */
+    @Excel(name = "民族")
+    private String nation;
+
+    /** 出生年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    public String getUserarea() {
+        return userarea;
+    }
+
+    public void setUserarea(String userarea) {
+        this.userarea = userarea;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getPolitics() {
+        return politics;
+    }
+
+    public void setPolitics(String politics) {
+        this.politics = politics;
+    }
+
+    public String getShemichengdu() {
+        return shemichengdu;
+    }
+
+    public void setShemichengdu(String shemichengdu) {
+        this.shemichengdu = shemichengdu;
+    }
+
+    public String getGraduate() {
+        return graduate;
+    }
+
+    public void setGraduate(String graduate) {
+        this.graduate = graduate;
+    }
+
+    public String getStartdata() {
+        return startdata;
+    }
+
+    public void setStartdata(String startdata) {
+        this.startdata = startdata;
+    }
+
+    public String getEnddata() {
+        return enddata;
+    }
+
+    public void setEnddata(String enddata) {
+        this.enddata = enddata;
+    }
+
+    public String getHelthy() {
+        return helthy;
+    }
+
+    public void setHelthy(String helthy) {
+        this.helthy = helthy;
+    }
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politics;
+
+    /** 涉密程度 */
+    @Excel(name = "涉密程度")
+    private String shemichengdu;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String graduate;
+
+    /** 生效时间 */
+    @Excel(name = "生效时间")
+    private String startdata;
+
+    /** 失效时间 */
+    @Excel(name = "失效时间")
+    private String enddata;
+
+    /** 健康状况 */
+    @Excel(name = "健康状况")
+    private String helthy;
+
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -357,29 +467,38 @@ public class SysUser extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("loginName", getLoginName())
-            .append("userName", getUserName())
-            .append("userType", getUserType())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("salt", getSalt())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-			.append("roles", getRoles())
-            .toString();
+        return "SysUser{" +
+                "userId=" + userId +
+                ", deptId=" + deptId +
+                ", parentId=" + parentId +
+                ", roleId=" + roleId +
+                ", loginName='" + loginName + '\'' +
+                ", userName='" + userName + '\'' +
+                ", userType='" + userType + '\'' +
+                ", email='" + email + '\'' +
+                ", phonenumber='" + phonenumber + '\'' +
+                ", sex='" + sex + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", password='" + password + '\'' +
+                ", salt='" + salt + '\'' +
+                ", status='" + status + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", loginIp='" + loginIp + '\'' +
+                ", loginDate=" + loginDate +
+                ", pwdUpdateDate=" + pwdUpdateDate +
+                ", userarea='" + userarea + '\'' +
+                ", nation='" + nation + '\'' +
+                ", birthday=" + birthday +
+                ", politics='" + politics + '\'' +
+                ", shemichengdu='" + shemichengdu + '\'' +
+                ", graduate='" + graduate + '\'' +
+                ", startdata='" + startdata + '\'' +
+                ", enddata='" + enddata + '\'' +
+                ", helthy='" + helthy + '\'' +
+                ", dept=" + dept +
+                ", roles=" + roles +
+                ", roleIds=" + Arrays.toString(roleIds) +
+                ", postIds=" + Arrays.toString(postIds) +
+                '}';
     }
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
index 24d076a..160f063 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
@@ -56,4 +56,9 @@ public enum BusinessType
      * 清空
      */
     CLEAN,
+
+    /**
+     * 考试
+     */
+    EXAM,
 }
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 13db1c3..c2691ac 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -23,6 +23,13 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <!-- mybatisplus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java
index 58618a5..a2e2e82 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TdExamnum;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TdExamnum;
  * @author ruoyi
  * @date 2024-04-10
  */
-public interface TdExamnumMapper 
+public interface TdExamnumMapper extends BaseMapper<TdExamnum>
 {
     /**
      * 查询考试结果
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java
index 7ca1fd7..6abe69a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.TdExamnum;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TdExamnum;
  * @author ruoyi
  * @date 2024-04-10
  */
-public interface ITdExamnumService 
+public interface ITdExamnumService extends IService<TdExamnum>
 {
     /**
      * 查询考试结果
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java
index b2ec5e4..2b1082a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java
@@ -1,6 +1,13 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TdExamnumMapper;
@@ -15,7 +22,7 @@ import com.ruoyi.common.core.text.Convert;
  * @date 2024-04-10
  */
 @Service
-public class TdExamnumServiceImpl implements ITdExamnumService 
+public class TdExamnumServiceImpl extends ServiceImpl<TdExamnumMapper,TdExamnum> implements ITdExamnumService
 {
     @Autowired
     private TdExamnumMapper tdExamnumMapper;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index d9a238b..a17c18d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
 	<insert id="insertOperlog" parameterType="SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, now())
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 74d66d1..e027cb5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -26,6 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"      column="update_by"       />
 		<result property="updateTime"    column="update_time"     />
 		<result property="remark"        column="remark"          />
+		<result property="userarea"    column="userarea"    />
+		<result property="nation"    column="nation"    />
+		<result property="birthday"    column="birthday"    />
+		<result property="politics"    column="politics"    />
+		<result property="shemichengdu"    column="shemichengdu"    />
+		<result property="graduate"    column="graduate"    />
+		<result property="startdata"    column="startdata"    />
+		<result property="enddata"    column="enddata"    />
+		<result property="helthy"    column="helthy"    />
 		<association property="dept"     column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
 	</resultMap>
@@ -50,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectUserVo">
-        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,
+        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata, helthy,
        		    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
 		from sys_user u
@@ -60,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata, helthy,d.dept_name, d.leader 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">
@@ -89,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata, helthy
 	    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
@@ -106,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata, helthy
 	    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
@@ -185,6 +194,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">pwd_update_date = #{pwdUpdateDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="userarea != null">userarea = #{userarea},</if>
+			<if test="nation != null">nation = #{nation},</if>
+			<if test="birthday != null">birthday = #{birthday},</if>
+			<if test="politics != null">politics = #{politics},</if>
+			<if test="shemichengdu != null">shemichengdu = #{shemichengdu},</if>
+			<if test="graduate != null">graduate = #{graduate},</if>
+			<if test="helthy != null">helthy = #{helthy},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
@@ -207,6 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+			<if test="userarea != null">userarea,</if>
+			<if test="nation != null">nation,</if>
+			<if test="birthday != null">birthday,</if>
+			<if test="politics != null">politics,</if>
+			<if test="shemichengdu != null">shemichengdu,</if>
+			<if test="graduate != null">graduate,</if>
+			<if test="helthy != null">helthy,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -224,6 +247,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+			<if test="userarea != null">#{userarea},</if>
+			<if test="nation != null">#{nation},</if>
+			<if test="birthday != null">#{birthday},</if>
+			<if test="politics != null">#{politics},</if>
+			<if test="shemichengdu != null">#{shemichengdu},</if>
+			<if test="graduate != null">#{graduate},</if>
+			<if test="startdata != null">#{startdata},</if>
+			<if test="enddata != null">#{enddata},</if>
+			<if test="helthy != null">#{helthy},</if>
  			sysdate()
  		)
 	</insert>