Merge branch 'master' into prod

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.xy.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,7 +19,6 @@ import com.xy.dto.be.MercUserDto;
 import com.xy.entity.UserInfo;
 import com.xy.mapper.UserInfoMapper;
 import com.xy.service.be.MercFeignService;
-import com.xy.service.be.MercUserService;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,7 +29,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -70,7 +67,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         listByRoleDto.setRoleCode(CommConsts.MERC_SH_ADMIN);
         listByRoleDto.setSysId(SysConstant.BIZ_SYS_ID);
         List<Long> userIds = R.feignCheckData(sysWorkUserService.getUserIdListByRole(listByRoleDto));
-        //所有售后管理员及管理员创建的用户
+        // 所有售后管理员及管理员创建的用户
         List<UserInfo> userInfoList = this.list(Wrappers.<UserInfo>lambdaQuery()
                 .and(deviceAlgorithmChargingLambdaQueryWrapper -> deviceAlgorithmChargingLambdaQueryWrapper
                         .in(UserInfo::getCreateUser, userIds)
@@ -132,7 +129,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         PageBean<UserInfoDto.Vo> data = toPageBean(UserInfoDto.Vo.class, iPage);
         List<UserInfoDto.Vo> records = data.getRecords();
         if (CollUtil.isNotEmpty(records)) {
-            //商管端，需要展示是否加入团队
+            // 商管端，需要展示是否加入团队
             Map<Long, MercUserDto.Vo> voMap = MapUtil.newHashMap();
             if (SysConstant.BIZ_PC_SYS_ID.longValue() == sysId.longValue()) {
                 List<Long> userInfoIds = records.stream().map(UserInfoDto.Vo::getUserId).distinct().collect(Collectors.toList());
@@ -165,18 +162,19 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("添加")
     @Lock(value = "save.tel", prefix = "user_save_")
     public R<UserInfoDto.Vo> save(UserInfoDto.Save save) {
-        //添加权限用户
+        // 添加权限用户
         AddDto addDto = copy(AddDto.class, save)
                 .setEmail(save.getMail())
                 .setPhone(save.getTel())
                 .setRoleIds(save.getRoleIds())
+                .setDeptIds(save.getDeptIds())
                 .setAccount(save.getAccount());
         R<Long> register = sysWorkUserService.register(addDto);
         if (register.getCode() != R.Enum.SUCCESS.getCode()) {
             return R.fail(register.getMsg());
         }
         Long authorizeUserId = register.getData();
-        //添加用户
+        // 添加用户
         Long loginId = AuthorizeUtils.getLoginId(Long.class);
         UserInfo saveInfo = copy(UserInfo.class, save)
                 .createUserTime(loginId)
@@ -214,8 +212,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserInfo updateInfo = copy(UserInfo.class, update)
                 .updateUserTime(AuthorizeUtils.getLoginId(Long.class));
         UserInfo u = getById(update.getUserId());
-        //修改权限用户
-        if (Emptys.check(update.getTel()) || Emptys.check(update.getMail()) || Emptys.check(update.getStatus()) || Emptys.check(update.getPassword())) {
+        // 修改权限用户
+        if (StrUtil.isNotEmpty(account) || update.getStatus() != null || update.getRoleIds() != null || update.getDeptIds() != null || Emptys.check(update.getRoleIds()) || Emptys.check(update.getTel()) || Emptys.check(update.getMail()) || Emptys.check(update.getStatus()) || Emptys.check(update.getPassword())) {
             UpdateDto updateDto = new UpdateDto()
                     .setId(u.getAuthorizeUserId())
                     .setAccount(account)
@@ -223,11 +221,13 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                     .setEmail(update.getMail())
                     .setPassword(update.getPassword())
                     .setStatus(update.getStatus())
+                    .setDeptIds(update.getDeptIds())
                     .setRoleIds(update.getRoleIds());
+
             log.info("权限用户信息修改：{}", JSONUtil.toJsonPrettyStr(updateDto));
             sysWorkUserService.update(updateDto);
         }
-        //修改用户
+        // 修改用户
         updateById(updateInfo);
         return R.ok();
     }
@@ -235,12 +235,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("删除用户")
     @Override
     public R del(@RequestBody @Validated UserInfoDto.DelDto dto) {
-        //sys_work_user 权限用户表
+        // sys_work_user 权限用户表
         R r = sysWorkUserService.del(copy(DelDto.class, dto));
         if (R.Enum.SUCCESS.getCode() != r.getCode()) {
             return R.fail(r.getMsg());
         }
-        //user_info 用户表
+        // user_info 用户表
         return R.ok(removeBatchByIds(dto.getId()));
     }
 

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -92,6 +92,9 @@ public class UserInfoDto {
         @ApiModelProperty(value = "角色ID(数组)")
         private List<Long> roleIds;
 
+        @ApiModelProperty(value = "部门ID(数组)", required = true)
+        private List<Long> deptIds;
+
     }
 
     @Data
@@ -130,6 +133,9 @@ public class UserInfoDto {
         @ApiModelProperty(value = "角色ID(数组)")
         private List<Long> roleIds;
 
+        @ApiModelProperty(value = "部门ID(数组)")
+        private List<Long> deptIds;
+
         @ApiModelProperty(value = "支付宝用户id")
         private String aliUserId;
 
@@ -170,7 +176,7 @@ public class UserInfoDto {
     public static class Vo {
         @ApiModelProperty(value = "是否拥有团队")
         private Boolean hasMercTeam;
-        
+
         @ApiModelProperty(value = "id")
         private Long userId;