anderx лет назад: 3
Родитель
Сommit
2d8ab68b32

+ 9 - 8
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -1,11 +1,6 @@
 package com.goafanti.admin.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
 
 import javax.annotation.Resource;
 
@@ -384,9 +379,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			depIds =departmentService.selectSubordinateDeps(depId);
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
-		for (AdminCustomerBo ad : list) {
+		Iterator<AdminCustomerBo> iterator = list.iterator();
+		while (iterator.hasNext()){
+			AdminCustomerBo ad=new AdminCustomerBo();
 			if (acb.getId().equals(ad.getDepId())){
 				acb.getaList().add(ad);
+				iterator.remove();
 			}
 		}
 		for (depCountBo dep : deps) {
@@ -406,11 +404,14 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	//迭代获取所有部门与部门员工并计算出部门数量
 	private List<depCountBo> iterationDeps(String id,List<AdminCustomerBo> list) {
 		List<depCountBo>  deps =departmentMapper.selectBysuperId(id);
+		Iterator<AdminCustomerBo> iterator = list.iterator();
 		for (depCountBo dep : deps) {
 			dep.setList(iterationDeps(dep.getId(),list));
-			for (AdminCustomerBo ad : list) {
+			while (iterator.hasNext()){
+				AdminCustomerBo ad=new AdminCustomerBo();
 				if (dep.getId().equals(ad.getDepId())){
 					dep.getaList().add(ad);
+					iterator.remove();
 				}
 			}
 			sumCount(dep);