优化

olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamServiceImpl.java

@@ -59,14 +59,13 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team>  implements Team
 		List<Team> list = teamDao.selectList(qw);
 		if(list.size()>0) {
 			for (Team team : list) {
+				//已完成
 				BigDecimal consume=taskService.queryConsume(team.getProjectId(),null,team.getDepartmentId(),null);
-				if(consume!=null) {
 				team.setConsume(consume);
-				}
+				//未完成
 				BigDecimal querySurplus = taskService.querySurplus(team.getProjectId(),null,team.getDepartmentId());
-				if(querySurplus!=null) {
 				team.setSurplus(querySurplus);
-				}
+				
 				TeamRequest aqr = new TeamRequest();
 				BeanUtils.copyProperties(team, aqr);
 				aqr.setUploadTime(DateUtils.dateTimeToStr(team.getUploadTime()));

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -204,6 +204,9 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
 			+ " AND a.user_id = #{userId} "
 			+ "</if>"
+			+ "<if test = 'departmentId ==null and departmentId==\"\"'> "
+			+ " and department_id is not null  "
+			+ "</if>"
 			+ "</script>")
 	BigDecimal querySurplus(String id,Integer userId,Integer departmentId);
 	@Select("<script>"