1

olive-console/src/main/java/com/zrqx/olive/timeApply/controller/TimeApplyChangeController.java

@@ -133,7 +133,7 @@ public class TimeApplyChangeController {
 		entity.setRemark(form.getRemark());
 		boolean b = timeApplyChangeService.updateById(entity);
 		if (b) {
-			if(entity.getStatus1().equals("1") || entity.getStatus2().equals("4")) {
+			if(entity.getStatus1().equals("1") && entity.getStatus2().equals("4")) {
 				StatisticsProject project = projectService.getById(entity.getProjectId());
 				if(project!=null) {
 					project.setTotalApplyTime(project.getTotalApplyTime().add(entity.getChangeTime()));
@@ -146,9 +146,8 @@ public class TimeApplyChangeController {
 				Team team = teamService.getOne(qw);
 				team.setTotal(team.getTotal().add(entity.getChangeTime()));
 				team.setToBeAllocated(team.getToBeAllocated().add(entity.getChangeTime()));
-				teamService.update(team, qw);
+				teamService.updateById(team);
 			}
-			
 		}
 		return CommonResult.success();
 	}

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

@@ -100,7 +100,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ " AND a.department_id = #{id} "
 			+ "</if>"
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
-			+ " AND a.user_id = #{id} "
+			+ " AND a.user_id = #{userId} "
 			+ "</if>"
 			+ "</script>")
 	BigDecimal queryConsume(String id,Integer userId,Integer departmentId);
@@ -115,7 +115,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ " and (task_status=1 or task_status=2)"
 			+ "</if>"
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
-			+ " AND a.user_id = #{id} "
+			+ " AND a.user_id = #{userId} "
 			+ " and (task_status=1 or task_status=2 or task_status=3)"
 			+ "</if>"
 			+ "</script>")