Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

         CmcUserHistory cmcUserHistory = new CmcUserHistory();
         SysUser sysUser = userService.selectUserById(user.getUserId());
         cmcUserHistory.setUserId(user.getUserId());
-        cmcUserHistory.setDeptId(user.getDeptId());
+        cmcUserHistory.setDeptId(sysUser.getDeptId());
         cmcUserHistory.setTitles(sysUser.getTitles());
         cmcUserHistory.setCertificates(sysUser.getCertificates());
         cmcUserHistory.setEngineerLevel(sysUser.getEngineerLevel());
         cmcUserHistory.setRoleIds(StringUtils.join(roleService.selectRoleListByUserId(user.getUserId()),","));
         cmcUserHistory.setPostIds(StringUtils.join(postService.selectPostListByUserId(user.getUserId()),","));
         cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
+        cmcUserHistory.setStatus(sysUser.getStatus());
         cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcUserHistory.java

     @Excel(name = "合同期满", width = 30, dateFormat = "yyyy-MM-dd")
     private Date contractExpire;
 
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
     /** 角色组 */
     private String roleIds;
 
     {
         this.postIds = postIds;
     }
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcUserHistoryMapper.xml

         <result property="degree"    column="degree"    />
         <result property="contractSign"    column="contract_sign"    />
         <result property="contractExpire"    column="contract_expire"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectCmcUserHistoryVo">
         select history_id, user_id, dept_id, titles, certificates, roleIds, postIds, pm_level, engineer_level, post_level, salary_level, operator_level, update_time, update_reason,
-            political_affiliation, graduate_school, major, degree, contract_sign, contract_expire from cmc_user_history
+            political_affiliation, graduate_school, major, degree, contract_sign, contract_expire, status from cmc_user_history
     </sql>
 
     <select id="selectCmcUserHistoryList" parameterType="CmcUserHistory" resultMap="CmcUserHistoryResult">
             <if test="degree != null">degree,</if>
             <if test="contractSign != null">contract_sign,</if>
             <if test="contractExpire != null">contract_expire,</if>
+            <if test="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
             <if test="degree != null">#{degree},</if>
             <if test="contractSign != null">#{contractSign},</if>
             <if test="contractExpire != null">#{contractExpire},</if>
+            <if test="status != null">#{status},</if>
          </trim>
     </insert>
 
             <if test="degree != null">#{degree},</if>
             <if test="contractSign != null">#{contractSign},</if>
             <if test="contractExpire != null">#{contractExpire},</if>
+            <if test="status != null">#{status},</if>
         </trim>
         where history_id  = #{historyId}
     </update>