From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/user/ListStaffRolesCmd.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffRolesCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffRolesCmd.java
index 98bf016..5daffff 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffRolesCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffRolesCmd.java
@@ -7,17 +7,16 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.org.OrgDto;
import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.dto.privilegeUser.PrivilegeUserDto;
-import com.java110.dto.roleCommunity.RoleCommunityDto;
-import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
+import com.java110.dto.privilege.PrivilegeUserDto;
+import com.java110.dto.privilege.RoleCommunityDto;
import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
+import com.java110.intf.user.IRoleCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import com.java110.vo.api.community.ApiCommunityDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -33,6 +32,9 @@
@Autowired
private IOrgV1InnerServiceSMO orgV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoleCommunityV1InnerServiceSMO roleCommunityV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -52,6 +54,14 @@
List<PrivilegeUserDto> roles = null;
if (count > 0) {
roles = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUsers(privilegeUserDto);
+ for (PrivilegeUserDto privilegeUserDto1 : roles) {
+ RoleCommunityDto roleCommunityDto=new RoleCommunityDto();
+ roleCommunityDto.setRoleId(privilegeUserDto1.getpId());
+ roleCommunityDto.setRow(Integer.valueOf("999"));
+ List<RoleCommunityDto> roleCommunityDtos = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitys(roleCommunityDto);
+ privilegeUserDto1.setRoleCommunityDtoList(roleCommunityDtos);
+ }
+
} else {
roles = new ArrayList<>();
--
Gitblit v1.8.0