From 4e12aa79fa3affb0d0dc3e5f9d368814702f8d2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 31 三月 2023 16:22:14 +0800
Subject: [PATCH] optimize owner member
---
service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 95 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java
index 0b6e211..bd385a0 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java
@@ -5,7 +5,13 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.org.OrgDto;
+import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -16,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 鏌ヨ涓嶅湪杩欎釜杩欎釜缁勭粐涓殑鍛樺伐
@@ -25,6 +32,16 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+ @Autowired
+ private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
+
+ @Autowired
+ private IOrgV1InnerServiceSMO orgV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -36,28 +53,100 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String storeId = context.getReqHeaders().get("store-id");
-
+ String userId = context.getReqHeaders().get("user-id");
UserDto userDto = new UserDto();
userDto.setStoreId(storeId);
userDto.setOrgId(reqJson.getString("orgId"));
userDto.setStaffName(reqJson.getString("staffName"));
+ // 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
+ UserDto userDto1 = new UserDto();
+ userDto1.setUserId(userId);
+ userDto1.setPage(1);
+ userDto1.setRow(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto1);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ if (!UserDto.LEVEL_CD_ADMIN.equals(userDtos.get(0).getLevelCd())) {
+ //榛樿鍙煡鐪嬪綋鍓嶅綊灞炵粍缁囨灦鏋�
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/viewAllOrganization");
+ basePrivilegeDto.setUserId(userId);
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ if (privileges.size() == 0) {
+ //鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(reqJson.getString("userId"));
+ List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIdsNew(orgStaffRelDto);
+ if (orgStaffRelDtos.size() > 0) {
+ List<String> haveOrgList = new ArrayList<String>();
+ for (OrgStaffRelDto orgStaffRelDto1 : orgStaffRelDtos) {
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgStaffRelDto1.getOrgId());
+ List<OrgDto> orgDtoList = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ findCompany(haveOrgList, orgDtoList);
+ }
+ userDto.setOrgIds(haveOrgList.toArray(new String[haveOrgList.size()]));//褰撳墠浜鸿櫧褰掑睘鐨勪簩绾х粍缁囦俊鎭�
+ }
+ }
+
+ }
int count = userV1InnerServiceSMOImpl.queryStaffsNoInOrgCount(userDto);
-
List<UserDto> staffsDtos = null;
-
if (count > 0) {
+ userDto.setPage(Integer.parseInt(reqJson.getString("page")));
+ userDto.setRow(Integer.parseInt(reqJson.getString("row")));
staffsDtos = userV1InnerServiceSMOImpl.queryStaffsNoInOrg(userDto);
} else {
staffsDtos = new ArrayList<>();
}
-
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffsDtos);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
context.setResponseEntity(responseEntity);
+ }
+
+ private void findCompany(List<String> haveOrgList, List<OrgDto> orgDtoList) {
+
+ for (OrgDto orgDto : orgDtoList) {
+ haveOrgList.add(orgDto.getOrgId());
+ if (!"1".equals(orgDto.getOrgLevel())) {
+ if ("2".equals(orgDto.getOrgLevel())) {
+ //涓婄骇鍒�
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgDto.getParentOrgId());
+ List<OrgDto> orgDtoList1 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ for (OrgDto orgDto2 : orgDtoList1) {
+ haveOrgList.add(orgDto2.getOrgId());
+ }
+ //鍚岀骇鍒�
+ OrgDto orgDto2 = new OrgDto();
+ orgDto2.setParentOrgId(orgDto.getOrgId());
+ List<OrgDto> orgDtoList2 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto2);
+ for (OrgDto orgDto3 : orgDtoList2) {
+ haveOrgList.add(orgDto3.getOrgId());
+ }
+ } else {
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgDto.getParentOrgId());
+ List<OrgDto> orgDtoList1 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ findCompany(haveOrgList, orgDtoList1);
+
+ //涓嬩竴涓骇鍒�
+ if (!"2".equals(orgDto.getOrgLevel())) {
+ OrgDto orgDto3 = new OrgDto();
+ orgDto3.setParentOrgId(orgDto.getOrgId());
+ List<OrgDto> orgDtoList2 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto3);
+ for (OrgDto orgDto4 : orgDtoList2) {
+ haveOrgList.add(orgDto4.getOrgId());
+ }
+ }
+
+ }
+
+ }
+ }
+
}
+
}
--
Gitblit v1.8.0