Merge branch 'new-emploee-upd' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionChangeRecord.java
#	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/biz/AppUserLoginBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -26,6 +26,7 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "姓名")
     private String name;
 
+
     @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
@@ -54,4 +55,5 @@ public class AppUserPositionTempDTO {
     private Integer userId;
 
 
+
 }

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

@@ -75,6 +75,10 @@ public class AppUserPositionTemp implements Serializable {
 	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
 
+    @Column(name = "is_quit")
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
 
     @Column(name = "is_quit")
     @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")

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

@@ -2,7 +2,6 @@ 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;
@@ -13,6 +12,7 @@ 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;
@@ -36,10 +36,6 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
-
-
-
-
     @Override
     @CacheClear(pre = "user{1.userid}")
     public void updateSelectiveById(AppUserDetail entity) {
@@ -217,4 +213,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
     }
 
+
+    /**
+     * 判断员工是否是APP用户
+     *
+     * @return
+     */
+    public AppUserDetail checkeIsAppUser(Integer userid) {
+        Example example = new Example(AppUserDetail.class);
+        example.createCriteria().andEqualTo("userid", userid);
+        List<AppUserDetail> appUserDetailList = mapper.selectByExample(example);
+        if (appUserDetailList != null && appUserDetailList.size() != 0) {
+            return appUserDetailList.get(0);
+        }
+        return null;
+    }
 }

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

@@ -350,7 +350,8 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
        
-        return mapper.getUserByUsernameAndRealName(username, realName);
+        return mapper.getUserByUsernameAndRealName(username,realName);
+
 
     }
 
@@ -425,7 +426,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public List<Integer> findAppuser(String phone, String leaderPhone, String name) {
         List<Integer> memberIds = null;
         //1.根据leader手机号查询userid
-        boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length() > 0;
+         boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length()>0;
         if (isNoNullLeaderPhone) {
             List<AppUserLogin> appUserLogins = mapper.selectbyPhones(Arrays.asList(leaderPhone));
             Integer leaderId = null;
@@ -435,18 +436,18 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
             leaderId = appUserLogins.get(0).getId();
         //2.根据leader userId查询下级 userid
         if (Objects.nonNull(leaderId)) {
-                memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId, 3);
-                if (CollectionUtils.isEmpty(memberIds)) {
+              memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId,3);
+            if(CollectionUtils.isEmpty(memberIds)){
                 return Collections.EMPTY_LIST;
             }
         }
         }
         List<Integer> userIds = mapper.findAppUser(phone, name, memberIds);
-        return userIds == null ? Collections.EMPTY_LIST : userIds;
+        return  userIds==null?Collections.EMPTY_LIST:userIds;
     }
 
     public List<UserBo> findUserDetailInfo(List<UserBo> userBos) {
-        Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x -> Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId));
+        Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x->Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId));
         List<Integer> userIdList = userBos.stream().map(UserBo::getUserId).distinct().collect(Collectors.toList());
 
         //查询上级人
@@ -454,13 +455,13 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         Map<Integer, Integer> memberIdAndParentMap = appUserRelationList.stream().collect(Collectors.toMap(AppUserRelation::getUserId, AppUserRelation::getParentId));
 
         List<Integer>  uids = new ArrayList<>();
-        uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdList);
-        uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdAndFacilitateIdMap.values());
-        uids.addAll(memberIdAndParentMap == null ? Collections.EMPTY_LIST : memberIdAndParentMap.values());
+        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdList);
+        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdAndFacilitateIdMap.values());
+        uids.addAll(memberIdAndParentMap==null?Collections.EMPTY_LIST:memberIdAndParentMap.values());
 
         List<UserBo> userBoList = mapper.selectByUserIds(uids);
-        Map<Integer, UserBo> userMap = userBoList == null ? Collections.EMPTY_MAP : userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
-        if (userMap.isEmpty()) {
+        Map<Integer, UserBo> userMap = userBoList==null?Collections.EMPTY_MAP:userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
+        if (userMap.isEmpty()){
             return Collections.EMPTY_LIST;
         }
 
@@ -483,14 +484,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return userBos;
     }
-
-
   @CacheClear(pre = "user{1}")
     public void updateUserPosition(Integer userId, Integer positionId, Integer operatorId) {
         AppUserLogin appUserLogin = selectById(userId);
         if (appUserLogin != null) {
             String phone = appUserLogin.getUsername();
-            appUserPositionTempBiz.findUserPositionTemp(phone, positionId, operatorId);
+            appUserPositionTempBiz.findUserPositionTemp(userId, positionId, operatorId);
         }
         appUserDetailBiz.updateUserPositionByUserId(userId, positionId);
     }

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

@@ -27,13 +27,12 @@ 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;
@@ -53,11 +52,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
     @Autowired
     private UserAuthUtil userAuthUtil;
 
-    private Integer ALL_PERMISSIONS = 1;
 
+    private Integer ALL_PERMISSIONS=1;
     /**
      * 查询所有
-     *
      * @return
      */
     @PostMapping("/findAll")
@@ -65,7 +63,7 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
         String token = userAuthConfig.getToken(request);
         ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
         User  user  = (User) objectRestResponse.getData();
-        if (user == null) {
+        if (user==null){
             throw new BaseException("User error!");
         }
         if (ALL_PERMISSIONS.equals(user.getDataAll())) {
@@ -79,19 +77,16 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
 
     /**
      * 根据用户id获取用户详情
-     *
      * @param userId
      * @return
      */
     @GetMapping("/user_info/{id}")
-    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId) {
+    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
          AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
          return ObjectRestResponse.succ(appUserManageVo);
     }
-
     /**
      * 查询一条
-     *
      * @param id
      * @return
      */
@@ -102,24 +97,22 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
 
     /**
      * 保存
-     *
      * @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);
@@ -129,12 +122,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
 
     /**
      * 取消禁用
-     *
      * @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);
@@ -144,12 +136,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
 
     /**
      * 删除用户
-     *
      * @param id
      * @return
      */
     @DeleteMapping("/deleteById/{id}")
-    public ObjectRestResponse deleteById(@PathVariable Integer id) {
+    public ObjectRestResponse deleteById(@PathVariable Integer id){
         appUserLoginBiz.deleteAppUserById(id);
         return ObjectRestResponse.succ();
     }
@@ -168,3 +159,4 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
     }
 
 }
+