Browse Source

Merge branch 'test'

# Conflicts:
#	src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
anderx 3 years ago
parent
commit
c276b82837

+ 4 - 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;
 
@@ -382,14 +377,15 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			acb.setId(depId);
 			deps=departmentMapper.selectBysuperId(oo.getId());
 			depIds =departmentService.selectSubordinateDeps(depId);
-
+			Department department = new Department();
+			department.setId(depId);
+			depIds.add(department);
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
 		for (AdminCustomerBo ad : list) {
 			if (acb.getId().equals(ad.getDepId())){
 				acb.getaList().add(ad);
 			}
-
 		}
 		for (depCountBo dep : deps) {
 			dep.setList(iterationDeps(dep.getId(),list));