Commit 1229a6c9 by qwmqiuwenmin

fix

parent 1e4a7834
......@@ -38,38 +38,38 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
// String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
int nodeCount = 0;
List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, null);
for (GicTreeDTO gicTreeDTO : departmentList) {
if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
nodeCount ++;
}
nodeCount += getNodeCount(enterpriseId,gicTreeDTO.getId(),gicTreeDTO.getType());
}
// List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,null, null);
// for (GicTreeDTO gicTreeDTO : departmentList) {
// if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
// nodeCount ++;
// }
// nodeCount += getNodeCount(enterpriseId,gicTreeDTO.getId(),gicTreeDTO.getType());
// }
enterpriseDetailDTO.setNodeCount(nodeCount);
}
return result;
}
public int getNodeCount(String enterpriseId,String parentId,int type) {
int nodeCount = 0;
List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId);
for (GicTreeDTO gicTreeDTO : departmentList) {
if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
nodeCount ++;
}
List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId());
while(!departmentList2.isEmpty()) {
for (GicTreeDTO gicTreeDTO2 : departmentList) {
nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType());
}
}
}
return nodeCount;
}
// public int getNodeCount(String enterpriseId,String parentId,int type) {
// int nodeCount = 0;
// List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId);
// for (GicTreeDTO gicTreeDTO : departmentList) {
// if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
// nodeCount ++;
// }
// List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId());
// while(!departmentList2.isEmpty()) {
// for (GicTreeDTO gicTreeDTO2 : departmentList) {
// nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType());
// }
// }
// }
//
// return nodeCount;
//
// }
@Override
public int wxEnterpriseBind(String enterpriseId, String wxEnterpriseId,
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