youxiw2000 / trash · Commits

Commit 2064b79ebc26b51198ae57265b940c6939ba47d8

Authored by youxiw2000
1 parent 5376142d

m

Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @2064b79
... ... @@ -96,12 +96,10 @@ public class ActTaskServiceImpl implements IActTaskService {
96 96 roles.add(ServletUtils.getParameter("dept"));
97 97 SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
98 98 }
99   -
100 99 if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
101 100 return list;
102 101 }
103 102  
104   -
105 103 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
106 104  
107 105 List<Task> tasks = pageTasks.getContent();
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @2064b79
... ... @@ -223,10 +223,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
223 223  
224 224 }
225 225  
226   -
227 226 List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
228 227  
229   -
230 228 long start = new Date().getTime();
231 229  
232 230 List<SupervisionThreestep> constructions = new ArrayList<>();
... ... @@ -330,7 +328,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
330 328 Map map = new HashMap();
331 329 boolean needAdd = true;
332 330 for(Map<String,String> m:list){
333   - if(e.getObjectId().equals(m.get("eid")) && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
  331 + if(e.getEarthsitesId().equals(m.get("objectId")) && e.getObjectId().equals(m.get("eid")) && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
334 332 needAdd = false;
335 333 break;
336 334 }
... ...