From de3590b244c8d2b9bec76f01d2f298f3fa670190 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 10 三月 2025 18:14:59 +0800
Subject: [PATCH] 优化员工详情功能
---
service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java | 138 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 133 insertions(+), 5 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 298c5bc..285229c 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,23 +5,77 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.doc.annotation.*;
+import com.java110.dto.privilege.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.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+
+
+@Java110CmdDoc(title = "鏌ヨ缁勭粐",
+ description = "涓昏鐢ㄤ簬娣诲姞鍛樺伐鏃剁殑缁勭粐ID 鍙互閫氳繃姝ゆ帴鍙ｆ煡璇紝 姝ゆ帴鍙ｈ繑鍥炰负鏍戝舰鎺ュ彛锛岃鍏朵粬绯荤粺鐢ㄦ爲褰㈢殑鏂瑰紡灞曠ず鏁版嵁锛屽叿浣撹鍙傝�冪墿涓氱郴缁熺粍缁囨灦鏋勫睍绀烘柟寮�",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/org.listOrgTree",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "org.listOrgTree",
+ seq = 8
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "orgId", length = 30, remark = "缁勭粐ID锛岄潪蹇呭～"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ @Java110ParamDoc(name = "data", type = "Object", remark = "鏈夋晥鏁版嵁"),
+ @Java110ParamDoc(parentNodeName = "data", name = "allOrgName", type = "String", remark = "缁勭粐鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "data", name = "id", type = "String", remark = "缁勭粐ID"),
+ @Java110ParamDoc(parentNodeName = "data", name = "children", type = "Array", remark = "瀛愯妭鐐�"),
+ @Java110ParamDoc(parentNodeName = "children", name = "allOrgName", type = "String", remark = "缁勭粐鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "children", name = "id", type = "String", remark = "缁勭粐ID"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody = "http://{ip}:{port}/app/org.listOrgTree",
+ resBody = "{\"code\":0,\"data\":{\"allOrgName\":\"婕旂ず鐗╀笟\",\"children\":[{\"allOrgName\":\"婕旂ず鐗╀笟 / 杞欢閮╘",\"icon\":\"/img/org.png\",\"id\":\"102022091988250052\",\"parentId\":\"842022081548770433\",\"text\":\"杞欢閮╘"}],\"icon\":\"/img/org.png\",\"id\":\"842022081548770433\",\"parentId\":\"-1\",\"text\":\"婕旂ず鐗╀笟\"},\"msg\":\"鎴愬姛\",\"page\":0,\"records\":1,\"rows\":0,\"total\":1}"
+)
@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 +91,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 +100,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 (ListUtil.isNull(privileges)) {
+ //鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(reqJson.getString("userId"));
+ List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIdsNew(orgStaffRelDto);
+ if (ListUtil.isNotNull(orgStaffRelDtos)) {
+ 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,16 +155,16 @@
List<OrgTreeDto> childs = new ArrayList<>();
OrgTreeDto child = null;
for (OrgDto orgDto : orgDtos) {
- if(parentOrgDto.getId().equals(orgDto.getOrgId())){ // 浠栬嚜宸辫烦杩�
+ if (parentOrgDto.getId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
continue;
}
- if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {
- child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId());
+ if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {//浜岀骇
+ child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId(), parentOrgDto.getAllOrgName() + " / " + orgDto.getOrgName());
childs.add(child);
}
}
- if (childs.size() < 1) {
+ if (ListUtil.isNull(childs)) {
return;
}
@@ -87,4 +174,45 @@
findChilds(orgTreeDto, orgDtos);
}
}
+
+ private void findCompany(List<String> haveOrgList, List<OrgDto> orgDtoList) {
+
+ for (OrgDto orgDto : orgDtoList) {
+ haveOrgList.add(orgDto.getOrgId());
+ if (OrgDto.ORG_LEVEL_STORE.equals(orgDto.getOrgLevel())) {
+ continue;
+ }
+ if (OrgDto.ORG_LEVEL_COMPANY.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 (!OrgDto.ORG_LEVEL_COMPANY.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