陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.system.user.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -87,4 +88,6 @@ public class UserVO extends User {
 	 */
 	@ApiModelProperty(value = "租户类型")
 	private Integer billType;
+
+	private String source;
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -38,7 +38,6 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.*;
-import org.springblade.system.entity.Role;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
@@ -126,7 +125,17 @@ public class UserController {
 				lambdaQueryWrapper.in(User::getId, userIdList);
 			}
 		}
-		return R.data(userService.list(lambdaQueryWrapper));
+
+		List<UserVO> userList = UserWrapper.build().listVO(userService.list(lambdaQueryWrapper));
+		if (StringUtil.isNotBlank(userVO.getSource())) {
+			userList.forEach(user -> {
+				R<List<String>> deptNameR = sysClient.getDeptNames(user.getDeptId());
+				if (deptNameR.isSuccess()) {
+					user.setDeptName(String.join(",", deptNameR.getData()));
+				}
+			});
+		}
+		return R.data(userList);
 	}
 
 	@GetMapping("/audit-user-list")