From 6da1b5b6b12707d4adebb2fc1bc27e2a218d7a06 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 24 Aug 2022 16:22:02 +0800 Subject: [PATCH 1/2] npe fix --- .../controller/AbilityCenterControllerV3.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java index 6d909c59..1c403257 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java @@ -239,9 +239,14 @@ public class AbilityCenterControllerV3 { return; } List dtoList = temp.get(deptId); + dtoList = dtoList.stream().map(index -> { + index.setResourceOwnerDept(sysDeptDTO); + return index; + }).collect(Collectors.toList()); + List finalDtoList = dtoList; CompletableFuture.runAsync(() -> { - String[] sqls = dtoList.stream().map(index -> String.format("UPDATE t_ability_application SET resource_owner_dept = '%s' WHERE id = %s", JSON.toJSONString(sysDeptDTO), index.getId())).collect(Collectors.toList()).toArray(new String[dtoList.size()]); + String[] sqls = finalDtoList.stream().map(index -> String.format("UPDATE t_ability_application SET resource_owner_dept = '%s' WHERE id = %s", JSON.toJSONString(sysDeptDTO), index.getId())).collect(Collectors.toList()).toArray(new String[finalDtoList.size()]); jdbcTemplate.batchUpdate(sqls); // 批量更新资源所属部门信息 logger.info("批量更新申请的资源的部门信息完成"); }, executor); @@ -292,9 +297,10 @@ public class AbilityCenterControllerV3 { Boolean finalCityApply = cityApply; Boolean finalCityApplyCity = cityApplyCity; Boolean finalCrossRegion = crossRegion; + List finalDtoList1 = dtoList; variables.putAll(new HashMap() { // 流程内携带属性值 { - put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请 + put("tAbilityApplicationDTOList", finalDtoList1); // 归属该部门的申请 put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id put("deptId", deptId); // 归属部门 put("_id", applyFlag); //申请id @@ -306,6 +312,7 @@ public class AbilityCenterControllerV3 { put("city_apply", finalCityApply); // 是否为市级部门发起申请 put("cross_region", finalCrossRegion); // 是否跨区 put("city_apply_city", finalCityApplyCity); // 是否为市区申请市区 + put("resource_dept", sysDeptDTO); // 同一审核单内部门信息 } }); @@ -313,10 +320,11 @@ public class AbilityCenterControllerV3 { ProcessInstanceDTO dto = actRunningService.startOfBusinessKey(processStartDTO); // 仿照请求接口 /processForm/tabilityapplication/updateInstanceId + List finalDtoList2 = dtoList; CompletableFuture.runAsync(() -> { if (dto.getBusinessKey() != null) { - String[] sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET instance_id = %s WHERE id = %s", dto.getProcessInstanceId(), i.getId())) - .collect(Collectors.toList()).toArray(new String[dtoList.size()]); + String[] sqls = finalDtoList2.stream().map(i -> String.format("UPDATE t_ability_application SET instance_id = %s WHERE id = %s", dto.getProcessInstanceId(), i.getId())) + .collect(Collectors.toList()).toArray(new String[finalDtoList2.size()]); jdbcTemplate.batchUpdate(sqls); } }, executor); From 738208ba2e8cae5ad8d63cda0b8981b0c71f4033 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 24 Aug 2022 17:13:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?applyState=20=E5=AD=97=E6=AE=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/resource/ResourceDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 0c8024e7..2a65dd18 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -116,7 +116,7 @@ sd.type AS "deptType", sd.sort AS "deptSort", sr.sort AS "regionSort", - IFNULL(taa2.approve_status, '未申请') AS "applyState", + IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState", IFNULL(trs.score, 0 ) AS "score", IFNULL(taa.applyCount, 0 ) AS "applyCount", IFNULL(trc.collectCount, 0) AS "collectCount", @@ -412,7 +412,7 @@ sd.sort AS "deptSort", sr.sort AS "regionSort", IFNULL(trc2.isCollect, 'false') AS "isCollect", - IFNULL(taa2.approve_status, '未申请') AS "applyState", + IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState", IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart", IF( IFNULL(taa3.approve_status, 0) < 1, '未通过', '通过' ) AS "approveStatus" FROM