From 17cc203eb7a86b08422617cab6911d2fefbdcc6e Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 13 Apr 2023 09:22:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workFlow/controller/WorkFlowController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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); + } } } } From 29ecbfafa59cfc732e5eb37044573bc4972731ea Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 13 Apr 2023 10:52:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?idm=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/sync/service/SyncUserService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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; } - - }