员工信息修改_APP用户列表联动更新

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -80,8 +80,4 @@ public class AppUserPositionTemp implements Serializable {
     private Integer isQuit;
 
 
-    @Column(name = "is_quit")
-    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
-    private Integer isQuit;
-
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -66,21 +66,22 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
-    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
+
+    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO, Integer updUserId) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
-        Integer companyId=appUserPositionTempDTO.getCompanyId();
-        String companyName=appUserPositionTempDTO.getCompanyName();
-       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
-           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
-        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
-        if (branchCompany==null){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        Integer companyId = appUserPositionTempDTO.getCompanyId();
+        String companyName = appUserPositionTempDTO.getCompanyName();
+        if (!(companyId != null && companyId > 0 && StringUtils.isNotBlank(companyName)))
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany = vehicleFeign.companyId(companyName);
+        if (branchCompany == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
         }
-        companyId=branchCompany.getId();
-        companyName=branchCompany.getName();
+        companyId = branchCompany.getId();
+        companyName = branchCompany.getName();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -105,12 +106,16 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         } else {
             updateSelectiveById(userPositionTemp);
         }
-        if (userId!=0){
-            detailBiz.updateUserPositionByUserId(userId,appUserPositionTempDTO.getPositionId());
+        if (userId != 0) {
+            detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId());
         }
+        //记录表插入
+        appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         return ObjectRestResponse.succ();
     }
 
+
+
     public void updateAppuserPostionStatusById(Integer id, int status) {
         AppUserPositionTemp appUserPositionTemp = new AppUserPositionTemp();
         appUserPositionTemp.setId(id);