m

youxiw2000
1 parent 5376142d
Showing 2 changed files with 1 additions and 5 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
@@ -96,12 +96,10 @@ public class ActTaskServiceImpl implements IActTaskService {
             roles.add(ServletUtils.getParameter("dept"));
             SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
         }
-
         if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
             return list;
         }
-
         org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
         List<Task> tasks = pageTasks.getContent();
@@ -223,10 +223,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
-
 		List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
-		
 		long start = new Date().getTime();
 		List<SupervisionThreestep> constructions = new ArrayList<>();
@@ -330,7 +328,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			Map map = new HashMap();
 			boolean needAdd = true;
 			for(Map<String,String> m:list){
-				if(e.getObjectId().equals(m.get("eid"))  && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
+				if(e.getEarthsitesId().equals(m.get("objectId")) && e.getObjectId().equals(m.get("eid"))  && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
 					needAdd = false;
 					break;
 				}