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 | 86 +++++++++++++++++++++----------------------
1 files changed, 42 insertions(+), 44 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 4533a69..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
@@ -17,6 +17,7 @@
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;
@@ -45,17 +46,17 @@
@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"),
+ @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}"
+ 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")
@@ -113,12 +114,12 @@
basePrivilegeDto.setResource("/viewAllOrganization");
basePrivilegeDto.setUserId(reqJson.getString("userId"));
List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- if (privileges.size() == 0) {
+ if (ListUtil.isNull(privileges)) {
//鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
orgStaffRelDto.setStaffId(reqJson.getString("userId"));
List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIdsNew(orgStaffRelDto);
- if (orgStaffRelDtos.size() > 0) {
+ if (ListUtil.isNotNull(orgStaffRelDtos)) {
List<String> haveOrgList = new ArrayList<String>();
for (OrgStaffRelDto orgStaffRelDto1 : orgStaffRelDtos) {
OrgDto orgDto1 = new OrgDto();
@@ -163,7 +164,7 @@
}
}
- if (childs.size() < 1) {
+ if (ListUtil.isNull(childs)) {
return;
}
@@ -178,43 +179,40 @@
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());
- }
- }
-
+ 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