diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 101132b5..d1c97064 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -521,13 +521,15 @@ public class WorkFlowController { pageInfo.setCount(Long.valueOf(0)); pageInfo.setPageSize(taskCommonQuery.getSize()); } - for (BusProcessName data : pageInfo.getList()) { - if (StringUtils.isNotBlank(data.getTaskIds())) { - String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds()); - if (s.equals("1")) { - data.setShowreceive(false); - } else { - data.setShowreceive(true); + if (pageInfo.getList() != null && !pageInfo.getList().isEmpty()) { + for (BusProcessName data : pageInfo.getList()) { + if (StringUtils.isNotBlank(data.getTaskIds())) { + String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds()); + if (s.equals("1")) { + data.setShowreceive(false); + } else { + data.setShowreceive(true); + } } } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index 5927b3e0..15267047 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -34,7 +34,7 @@ public class SyncUserService { do { Map params = new HashMap(); params.put("cookie", Base64.encodeBase64String(cookie)); - params.put("timestamp", "20141125065609Z"); + params.put("timestamp", System.currentTimeMillis()); // 用户参数 params.put("filter", "(userid=*)"); @@ -81,7 +81,7 @@ public class SyncUserService { do { Map params = new HashMap(); params.put("cookie", Base64.encodeBase64String(cookie)); - params.put("timestamp", "20141125065609Z"); + params.put("timestamp", System.currentTimeMillis()); // 组织参数 params.put("filter", "(orgNumber=*)"); @@ -113,6 +113,4 @@ public class SyncUserService { } while (cookie != null); return json; } - - }