Skip to content

H
haoban-manage3.0
Commit 1229a6c9 by qwmqiuwenmin
Options

fix

parent 1e4a7834
Showing with 26 additions and 26 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
...@@ -38,38 +38,38 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi ...@@ -38,38 +38,38 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId); List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList); List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
for (EnterpriseDetailDTO enterpriseDetailDTO : result) { for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
String enterpriseId = enterpriseDetailDTO.getEnterpriseId(); // String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
int nodeCount = 0; int nodeCount = 0;
List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, null); // List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, null);
for (GicTreeDTO gicTreeDTO : departmentList) { // for (GicTreeDTO gicTreeDTO : departmentList) {
if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) { // if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
nodeCount ++; // nodeCount ++;
} // }
nodeCount += getNodeCount(enterpriseId,gicTreeDTO.getId(),gicTreeDTO.getType()); // nodeCount += getNodeCount(enterpriseId,gicTreeDTO.getId(),gicTreeDTO.getType());
} // }
enterpriseDetailDTO.setNodeCount(nodeCount); enterpriseDetailDTO.setNodeCount(nodeCount);
} }
return result; return result;
} }
public int getNodeCount(String enterpriseId,String parentId,int type) { // public int getNodeCount(String enterpriseId,String parentId,int type) {
int nodeCount = 0; // int nodeCount = 0;
List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId); // List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId);
for (GicTreeDTO gicTreeDTO : departmentList) { // for (GicTreeDTO gicTreeDTO : departmentList) {
if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) { // if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
nodeCount ++; // nodeCount ++;
} // }
List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId()); // List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId());
while(!departmentList2.isEmpty()) { // while(!departmentList2.isEmpty()) {
for (GicTreeDTO gicTreeDTO2 : departmentList) { // for (GicTreeDTO gicTreeDTO2 : departmentList) {
nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType()); // nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType());
} // }
} // }
} // }
//
return nodeCount; // return nodeCount;
//
} // }
@Override @Override
public int wxEnterpriseBind(String enterpriseId, String wxEnterpriseId, public int wxEnterpriseBind(String enterpriseId, String wxEnterpriseId,
String version) { String version) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment