团队成员增加部门选项

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;
@@ -170,6 +167,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                 .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()) {
@@ -223,7 +221,9 @@ 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);
         }

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;