|
|
@@ -369,7 +369,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
"'endTime:'+#endTime+'aName:'+#aName")
|
|
|
public depCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
|
|
|
depCountBo acb=new depCountBo();
|
|
|
- endTime=endTime+" 23:59:59";
|
|
|
+ if (endTime!=null)endTime=endTime+" 23:59:59";
|
|
|
List<depCountBo >deps=new ArrayList<>();
|
|
|
if (depId==null) {
|
|
|
acb.setName("科德集团");
|
|
|
@@ -386,6 +386,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
//计算顶层
|
|
|
acb.setaList(organizationManagementMapper.getDepAll(depId,aName,startTime, endTime));
|
|
|
sumCount(acb,0);
|
|
|
+ //
|
|
|
return acb;
|
|
|
}
|
|
|
|