From b62982b12ce5efd9601690c59212b8047c0aaa36 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 九月 2022 10:37:14 +0800
Subject: [PATCH] 加入 查询员工
---
service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java b/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
index 65fd7bc..a2fe41b 100644
--- a/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
@@ -5,9 +5,15 @@
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.org.OrgTreeDto;
+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;
import com.java110.utils.util.StringUtil;
@@ -16,12 +22,25 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Java110Cmd(serviceCode = "org.listOrgTree")
public class ListOrgTreeCmd extends Cmd {
@Autowired
private IOrgV1InnerServiceSMO orgV1InnerServiceSMOImpl;
+
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+ @Autowired
+ private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
+
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -37,6 +56,7 @@
@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");
if (StringUtil.isEmpty(storeId)) {
storeId = reqJson.getString("storeId");
}
@@ -45,12 +65,44 @@
OrgDto orgDto = new OrgDto();
orgDto.setStoreId(storeId);
+
+ // 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ if (!UserDto.LEVEL_CD_ADMIN.equals(userDtos.get(0).getLevelCd())) {
+ //榛樿鍙煡鐪嬪綋鍓嶅綊灞炵粍缁囨灦鏋�
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/viewAllOrganization");
+ basePrivilegeDto.setUserId(reqJson.getString("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);
+ }
+ orgDto.setOrgIds(haveOrgList.toArray(new String[haveOrgList.size()]));//褰撳墠浜鸿櫧褰掑睘鐨勪簩绾х粍缁囦俊鎭�
+ }
+ }
+ }
+
List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
OrgTreeDto storeOrgTreeDto = null;
for (OrgDto tmpOrgDto : orgDtos) {
if (OrgDto.ORG_LEVEL_STORE.equals(tmpOrgDto.getOrgLevel())) {
- storeOrgTreeDto = new OrgTreeDto(tmpOrgDto.getOrgId(), tmpOrgDto.getOrgName(), tmpOrgDto.getParentOrgId());
+ storeOrgTreeDto = new OrgTreeDto(tmpOrgDto.getOrgId(), tmpOrgDto.getOrgName(), tmpOrgDto.getParentOrgId(), tmpOrgDto.getOrgName());
}
}
@@ -68,8 +120,11 @@
List<OrgTreeDto> childs = new ArrayList<>();
OrgTreeDto child = null;
for (OrgDto orgDto : orgDtos) {
- if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {
- child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId());
+ if (parentOrgDto.getId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
+ continue;
+ }
+ if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {//浜岀骇
+ child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId(), parentOrgDto.getAllOrgName() + " / " + orgDto.getOrgName());
childs.add(child);
}
}
@@ -84,4 +139,48 @@
findChilds(orgTreeDto, orgDtos);
}
}
+
+ 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