FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-04-13 10:58:57 +08:00
parent 09764af4a0 29ecbfafa5
commit 4ec35f2f45
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+9 -7
View File
@@ -521,13 +521,15 @@ public class WorkFlowController {
pageInfo.setCount(Long.valueOf(0)); pageInfo.setCount(Long.valueOf(0));
pageInfo.setPageSize(taskCommonQuery.getSize()); pageInfo.setPageSize(taskCommonQuery.getSize());
} }
for (BusProcessName data : pageInfo.getList()) { if (pageInfo.getList() != null && !pageInfo.getList().isEmpty()) {
if (StringUtils.isNotBlank(data.getTaskIds())) { for (BusProcessName data : pageInfo.getList()) {
String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds()); if (StringUtils.isNotBlank(data.getTaskIds())) {
if (s.equals("1")) { String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds());
data.setShowreceive(false); if (s.equals("1")) {
} else { data.setShowreceive(false);
data.setShowreceive(true); } else {
data.setShowreceive(true);
}
} }
} }
} }
adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
+2 -4
View File
@@ -34,7 +34,7 @@ public class SyncUserService {
do { do {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("cookie", Base64.encodeBase64String(cookie)); params.put("cookie", Base64.encodeBase64String(cookie));
params.put("timestamp", "20141125065609Z"); params.put("timestamp", System.currentTimeMillis());
// 用户参数 // 用户参数
params.put("filter", "(userid=*)"); params.put("filter", "(userid=*)");
@@ -81,7 +81,7 @@ public class SyncUserService {
do { do {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("cookie", Base64.encodeBase64String(cookie)); params.put("cookie", Base64.encodeBase64String(cookie));
params.put("timestamp", "20141125065609Z"); params.put("timestamp", System.currentTimeMillis());
// 组织参数 // 组织参数
params.put("filter", "(orgNumber=*)"); params.put("filter", "(orgNumber=*)");
@@ -113,6 +113,4 @@ public class SyncUserService {
} while (cookie != null); } while (cookie != null);
return json; return json;
} }
} }