From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java | 40 ++--------------------------------------
1 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
index 92030c3..8148c25 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
@@ -38,7 +38,8 @@
url = "http://{ip}:{port}/app/query.staff.infos",
resource = "userDoc",
author = "鍚村鏂�",
- serviceCode = "query.staff.infos"
+ serviceCode = "query.staff.infos",
+ seq = 6
)
@Java110ParamsDoc(params = {
@@ -89,9 +90,6 @@
@Autowired
private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
-
-
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.hasKeyAndValue(reqJson, "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
@@ -107,8 +105,6 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
UserDto userDto = BeanConvertUtil.covertBean(reqJson, UserDto.class);
String userId = context.getReqHeaders().get("user-id");
-
-
// 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
UserDto userDto1 = new UserDto();
userDto1.setUserId(userId);
@@ -139,11 +135,8 @@
}
}
}
-
int count = userInnerServiceSMOImpl.getStaffCount(userDto);
-
List<ApiStaffDataVo> staffs = new ArrayList<>();
-
if (count > 0) {
List<ApiStaffDataVo> staffList = BeanConvertUtil.covertBeanList(userInnerServiceSMOImpl.getStaffs(userDto), ApiStaffDataVo.class);
for (ApiStaffDataVo apiStaffDataVo : staffList) {
@@ -165,15 +158,11 @@
} else {
staffs = new ArrayList<>();
}
-
ApiStaffVo apiStaffVo = new ApiStaffVo();
-
apiStaffVo.setTotal(count);
apiStaffVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
apiStaffVo.setStaffs(staffs);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiStaffVo), HttpStatus.OK);
-
context.setResponseEntity(responseEntity);
}
@@ -181,12 +170,10 @@
if (staffs == null || staffs.size() < 1) {
return;
}
-
List<String> staffIds = new ArrayList<>();
for (ApiStaffDataVo apiStaffDataVo : staffs) {
staffIds.add(apiStaffDataVo.getUserId());
}
-
OrgDto orgDto = new OrgDto();
orgDto.setStoreId(storeId);
List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
@@ -197,11 +184,9 @@
orgStaffRelDto.setStaffIds(staffIds.toArray(new String[staffIds.size()]));
orgStaffRelDto.setStoreId(storeId);
List<OrgStaffRelDto> orgStaffRels = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
-
if (orgStaffRels == null || orgStaffRels.size() < 1) {
return;
}
-
for (ApiStaffDataVo apiStaffDataVo : staffs) {
for (OrgStaffRelDto tmpOrgStaffRelDto : orgStaffRels) {
if (!apiStaffDataVo.getUserId().equals(tmpOrgStaffRelDto.getStaffId())) {
@@ -217,19 +202,14 @@
apiStaffDataVo.setParentTwoOrgId(orgs.get(0).getParentOrgId());
}
}
-
for (ApiStaffDataVo apiStaffDataVo : staffs) {
if (StringUtil.isEmpty(apiStaffDataVo.getOrgId())) {
continue;
}
apiStaffDataVo.setParentOrgId(apiStaffDataVo.getOrgId());
-
findParents(apiStaffDataVo, orgDtos, null, 0);
-
}
-
}
-
private void findParents(ApiStaffDataVo apiStaffDataVo, List<OrgDto> orgDtos, OrgDto curOrgDto, int orgDeep) {
for (OrgDto orgDto : orgDtos) {
@@ -237,14 +217,11 @@
if (!apiStaffDataVo.getParentOrgId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
continue;
}
-
//濡傛灉鍒颁竴绾� 灏辩粨鏉�
if (OrgDto.ORG_LEVEL_STORE.equals(apiStaffDataVo.getOrgLevel())) {
continue;
}
-
apiStaffDataVo.setParentOrgId(orgDto.getParentOrgId());
-
if (StringUtil.isEmpty(apiStaffDataVo.getOrgName())) {
apiStaffDataVo.setOrgName(orgDto.getOrgName());
continue;
@@ -252,25 +229,19 @@
apiStaffDataVo.setOrgName(orgDto.getOrgName() + " / " + apiStaffDataVo.getOrgName());
apiStaffDataVo.setOrgLevel(orgDto.getOrgLevel());
}
-
if (curOrgDto != null && OrgDto.ORG_LEVEL_STORE.equals(curOrgDto.getOrgLevel())) {
return;
}
-
if (curOrgDto != null && curOrgDto.getParentOrgId().equals(curOrgDto.getOrgId())) {
return;
}
-
if (curOrgDto != null && "-1".equals(curOrgDto.getParentOrgId())) {
return;
}
-
orgDeep += 1;
-
if (orgDeep > 20) {
return;
}
-
findParents(apiStaffDataVo, orgDtos, curOrgDto, orgDeep);
}
@@ -280,7 +251,6 @@
* @param staffs
*/
private void refreshInitials(List<ApiStaffDataVo> staffs) {
-
for (ApiStaffDataVo staffDataVo : staffs) {
if (StringUtil.isEmpty(staffDataVo.getName())) {
continue;
@@ -313,7 +283,6 @@
orgDto1.setOrgId(orgDto.getParentOrgId());
List<OrgDto> orgDtoList1 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
findCompany(haveOrgList, orgDtoList1);
-
//涓嬩竴涓骇鍒�
if (!"2".equals(orgDto.getOrgLevel())) {
OrgDto orgDto3 = new OrgDto();
@@ -323,13 +292,8 @@
haveOrgList.add(orgDto4.getOrgId());
}
}
-
}
-
}
}
-
-
}
-
}
--
Gitblit v1.8.0