Merge branch 'feature-emploee-upd' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

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

@@ -2,20 +2,22 @@ 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;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -36,6 +38,15 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
+    @Autowired
+    AppUserPositionTempBiz appUserPositionTempBiz;
+
+    @Autowired
+    AppUserLoginBiz appUserLoginBiz;
+
+    @Autowired
+    AppUserDetailBiz appUserDetailBiz;
+
     @Override
     @CacheClear(pre = "user{1.userid}")
     public void updateSelectiveById(AppUserDetail entity) {
@@ -95,13 +106,13 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         AppUserDetail entity = new AppUserDetail();
         Example example = new Example(AppUserDetail.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("userid",userVo.getUserid());
+        criteria.andEqualTo("userid", userVo.getUserid());
         try {
             BeanUtils.copyProperties(entity, userVo);
             if (entity != null) {
                 entity.setUpdHost(AppPermissionService.getIp());
                 entity.setUpdatetime(Instant.now().toEpochMilli() / 1000L);
-                mapper.updateByExampleSelective(entity,example);
+                mapper.updateByExampleSelective(entity, example);
             }
 
         } catch (Exception e) {
@@ -132,10 +143,6 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         mapper.deleteByExample(example);
     }
 
-    @CacheClear(pre = "user{1}")
-    public void updateUserPositionByUserId(Integer userId, Integer positionId) {
-        mapper.updateUserPositionByUserId(userId,positionId);
-    }
 
     public AppUserInfoVo findUserInfoByCode(String code) {
         AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
@@ -144,31 +151,31 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         appUserDetail.setCode(code);
         AppUserDetail userDetail = mapper.selectOne(appUserDetail);
 
-        if (userDetail==null){
+        if (userDetail == null) {
             return appUserInfoVo;
         }
-       appUserInfoVo.setHeadimgurl(userDetail.getHeadimgurl());
+        appUserInfoVo.setHeadimgurl(userDetail.getHeadimgurl());
         appUserInfoVo.setNickname(userDetail.getNickname());
-        return  appUserInfoVo;
+        return appUserInfoVo;
     }
 
     public List<Integer> getUserIdByUsername(String keywords) {
         return mapper.getUserIdByUsername(keywords);
     }
 
-    public void updateByUserId(AccountBindDTO accountBindDTO,Integer userId) {
+    public void updateByUserId(AccountBindDTO accountBindDTO, Integer userId) {
 
         AppUserDetail appUserDetail = new AppUserDetail();
-        if (accountBindDTO.getType().equals("wx")){
+        if (accountBindDTO.getType().equals("wx")) {
             appUserDetail.setWxNickname(accountBindDTO.getNickName());
         }
-        if(accountBindDTO.getType().equals("q")){
+        if (accountBindDTO.getType().equals("q")) {
             appUserDetail.setQqNickname(accountBindDTO.getNickName());
         }
         Example example = new Example(AppUserDetail.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("userid",userId);
-        mapper.updateByExampleSelective(appUserDetail,example);
+        criteria.andEqualTo("userid", userId);
+        mapper.updateByExampleSelective(appUserDetail, example);
     }
 
     public List<AppUserVo> getUserByUserIds(List<Integer> ids) {
@@ -177,21 +184,21 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     public List<UserStaffBo> findAllStaffs() {
         List<UserStaffBo> userStaffBos = mapper.selectAllStaffs();
-        return CollectionUtils.isEmpty(userStaffBos)? Collections.EMPTY_LIST:userStaffBos;
+        return CollectionUtils.isEmpty(userStaffBos) ? Collections.EMPTY_LIST : userStaffBos;
     }
 
     public List<AppUserVo> getUserByUserIdList(List<Integer> userIds) {
-          List<AppUserVo> appUserVos =  mapper.getUserByUserIdList(userIds);
-        return CollectionUtils.isEmpty(appUserVos)?Collections.EMPTY_LIST:appUserVos;
+        List<AppUserVo> appUserVos = mapper.getUserByUserIdList(userIds);
+        return CollectionUtils.isEmpty(appUserVos) ? Collections.EMPTY_LIST : appUserVos;
     }
 
     public PageDataVO<UserStaffBo> findAllStaffsByCompanyIdAndPostionIdWithPage(StaffStatisticsFindDTO staffStatisticsFindDTO) {
-       return PageDataVO.pageInfo(staffStatisticsFindDTO.getPage(),staffStatisticsFindDTO.getLimit(),()->mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO));
+        return PageDataVO.pageInfo(staffStatisticsFindDTO.getPage(), staffStatisticsFindDTO.getLimit(), () -> mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO));
     }
 
     public List<UserStaffBo> findStaffsByIdsAndCompanyAndPostion(StaffStatisticsFindDTO staffStatisticsFindDTO) {
         List<UserStaffBo> staffBos = mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO);
-        return CollectionUtils.isEmpty(staffBos)?Collections.EMPTY_LIST:staffBos;
+        return CollectionUtils.isEmpty(staffBos) ? Collections.EMPTY_LIST : staffBos;
     }
 
     public AppUserVo findByCode(String code) {
@@ -199,17 +206,26 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         AppUserDetail appUserDetail = new AppUserDetail();
         appUserDetail.setCode(code);
         appUserDetail = mapper.selectOne(appUserDetail);
-        org.springframework.beans.BeanUtils.copyProperties(appUserDetail,appUserVo);
+        org.springframework.beans.BeanUtils.copyProperties(appUserDetail, appUserVo);
         return appUserVo;
     }
 
-    public AppUserVo getUser(Integer userId) {
-
-        return mapper.getUser(userId);
+    @CacheClear(pre = "user{1}")
+    public void updateUserPositionByUserId(Integer userId, Integer positionId) {
+        mapper.updateUserPositionByUserId(userId, positionId);
     }
 
-    public List<UserBo> findUserBosByPhones(List<String> phones) {
-         List<UserBo> userBoList = mapper.findUserBosByPhones(phones);
-        return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
+    @CacheClear(pre = "user{1}")
+    public void updateUserPosition(Integer userId, Integer positionId, Integer operatorId) {
+        AppUserLogin appUserLogin = new AppUserLogin();
+        if (appUserLoginBiz.selectById(userId) != null) {
+            appUserLogin= appUserLoginBiz.selectById(userId);
+            if (appUserLogin != null) {
+                String phone = appUserLogin.getUsername();
+                appUserPositionTempBiz.findUserPositionTemp(phone, positionId, operatorId);
+            }
+        }
+        mapper.updateUserPositionByUserId(userId, positionId);
     }
+
 }

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionChangeRecordMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.select.Evaluator;
 import org.springframework.beans.BeanUtils;
@@ -39,7 +40,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public static final int POSITION_CHANGE = 3;
     public static final int COMPANY_CHANGE = 4;
     public static final int USER_LEAVE_COMPANT = 5;
-    public static final int USER_AND_ADD_COMPANY=6;
+    public static final int USER_AND_ADD_COMPANY = 6;
 
     /**
      * 变更记录表插入
@@ -103,12 +104,16 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
 
     /**
      * 员工复职
+     *
      * @param userPositionTemp
      * @param updUserId
      */
     public void andAddJoinJobRecord(AppUserPositionTempDTO userPositionTemp, Integer updUserId) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
         appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        if (userPositionTemp.getPositionId() != null) {
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+        }
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setRelTime(userPositionTemp.getRelTime());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
@@ -117,9 +122,24 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         mapper.insert(appUserPositionChangeRecord);
     }
 
-
-
-
+    /**
+     * APP用户修改身份
+     *
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void andAddJoinJobRecord(AppUserPositionTemp userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        if (userPositionTemp.getPositionId() != null) {
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+        }
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_AND_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
 
 
     /**

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

@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
-import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -15,8 +12,10 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.im.utils.BeanUtil;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -66,6 +66,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserJobLevelBiz jobLevelBiz;
 
+    @Autowired
+    AppUserDetailBiz appUserDetailBiz;
+
     @Autowired
     AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
@@ -140,6 +143,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
             criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
         }
+        if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) {
+            criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId());
+        }
         if (Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
                 criteria.andNotEqualTo("userId", 0);
@@ -374,7 +380,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return mapper.getUserIdByParentCompany(parentCompanyId);
     }
 
-
     /**
      * 员工信息修改，插入变更记录表
      * zuoyh
@@ -418,6 +423,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             updateSelectiveById(userPositionTemp);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
+        //用户表更改其身份
+        AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone());
+        if (userLogin != null) {
+            appUserDetailBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId(), operatorId);
+        }
         return ObjectRestResponse.succ();
     }
 
@@ -433,6 +443,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         updateSelectiveById(userPositionTemp);
         userPositionTemp.setUpdTime(System.currentTimeMillis());
         appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
+        //用户表更改其身份
+        AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone());
+        if (userLogin != null) {
+            AppUserDetail appUserDetail = new AppUserDetail();
+            appUserDetailBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId(), operatorId);
+        }
         return ObjectRestResponse.succ();
     }
 
@@ -445,4 +461,26 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return appUserPositionChangeRecordBiz.findPositionChangeRecord(userPositionTemp);
     }
 
+    /**
+     * zuoyh
+     * app用户表修改职位，员工记录表对应查询
+     */
+    public void findUserPositionTemp(String phone, Integer positionId, Integer operatorId) {
+        Timestamp relTime = new Timestamp(System.currentTimeMillis());
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("phone", phone);
+        List<AppUserPositionTemp> list = mapper.selectByExample(example);
+        AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp();
+        if (list.size()>0) {
+            newAppUserPositionTemp =list.get(0);
+            if (newAppUserPositionTemp != null) {
+                AppUserPositionTemp odlAppUserPositionTemp = new AppUserPositionTemp();
+                BeanUtils.copyProperties(newAppUserPositionTemp, odlAppUserPositionTemp);
+                newAppUserPositionTemp.setPositionId(positionId);
+                newAppUserPositionTemp.setUpdTime(System.currentTimeMillis());
+                mapper.updateByPrimaryKey(newAppUserPositionTemp);
+                appUserPositionChangeRecordBiz.addPositionChangeRecord(newAppUserPositionTemp, odlAppUserPositionTemp, operatorId, relTime);
+            }
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -12,22 +12,28 @@ import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Set;
 
 /**
  * app用户管理类
+ *
  * @author Administrator
  */
+@Slf4j
 @RestController
 @RequestMapping("appUsersManage")
-public class AppUsersManageController extends BaseController<AppUserManageBiz,AppUserManage> {
+public class AppUsersManageController extends BaseController<AppUserManageBiz, AppUserManage> {
 
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
@@ -44,66 +50,76 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     @Autowired
     private VehicleFeign vehicleFeign;
 
-    private Integer ALL_PERMISSIONS=1;
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    private Integer ALL_PERMISSIONS = 1;
+
     /**
-     * 查询所有,获取详细信息
+     * 查询所有
+     *
      * @return
      */
     @PostMapping("/findAll")
     public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
         String token = userAuthConfig.getToken(request);
         ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
-        User  user  = (User) objectRestResponse.getData();
-        if (user==null){
+        User user = (User) objectRestResponse.getData();
+        if (user == null) {
             throw new BaseException("User error!");
         }
         if (ALL_PERMISSIONS.equals(user.getDataAll())) {
             return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
         }
         ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
-        Set<Integer> cityList =  setObjectRestResponse.getData();
+        Set<Integer> cityList = setObjectRestResponse.getData();
         appUserManageDTO.setCitySet(cityList);
-        return  ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
+        return ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
     }
 
     /**
      * 根据用户id获取用户详情
+     *
      * @param userId
      * @return
      */
     @GetMapping("/user_info/{id}")
-    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
-         AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
-         return ObjectRestResponse.succ(appUserManageVo);
+    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId) {
+        AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
+        return ObjectRestResponse.succ(appUserManageVo);
     }
+
     /**
      * 查询一条
+     *
      * @param id
      * @return
      */
     @GetMapping("/findOneById/{id}")
-    public ObjectRestResponse<AppUserVo> findOneById(@PathVariable Integer id){
+    public ObjectRestResponse<AppUserVo> findOneById(@PathVariable Integer id) {
         return ObjectRestResponse.succ(baseBiz.findOneById(id));
     }
 
     /**
      * 保存
+     *
      * @param appUserVo
      * @return
      */
     @PostMapping("/save")
-    public ObjectRestResponse save(@RequestBody AppUserVo  appUserVo){
+    public ObjectRestResponse save(@RequestBody AppUserVo appUserVo) {
         baseBiz.save(appUserVo);
         return ObjectRestResponse.succ();
     }
 
     /**
      * 禁用
+     *
      * @param appUserId
      * @return
      */
     @PutMapping("/disable/{appUserId}")
-    public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId){
+    public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setStatus(Status.FORBIDDEN);
         appUserLogin.setId(appUserId);
@@ -113,11 +129,12 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
 
     /**
      * 取消禁用
+     *
      * @param appUserId
      * @return
      */
     @PutMapping("/available/{appUserId}")
-    public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId){
+    public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setStatus(Status.AVAILABLE);
         appUserLogin.setId(appUserId);
@@ -127,19 +144,27 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
 
     /**
      * 删除用户
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/deleteById/{id}")
-    public ObjectRestResponse deleteById(@PathVariable Integer id){
+    public ObjectRestResponse deleteById(@PathVariable Integer id) {
         appUserLoginBiz.deleteAppUserById(id);
         return ObjectRestResponse.succ();
     }
 
     @PutMapping("/user_position")
-    public ObjectRestResponse<Void> setUserPositionById(@RequestParam("id") Integer id,@RequestParam("positionId") Integer positionId){
-         appUserDetailBiz.updateUserPositionByUserId(id,positionId);
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<Void> setUserPositionById(@RequestParam("id") Integer id, @RequestParam("positionId") Integer positionId, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserDetailBiz.updateUserPosition(id, positionId,operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
     }
-}
 
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -114,7 +114,7 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId));
+            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId)) ;
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");
@@ -138,7 +138,8 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            return ObjectRestResponse.succ(appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO, operatorId));
+            appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO, operatorId);
+            return ObjectRestResponse.succ();
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");