From 71611ec1d68ae3b7a4223189a5dc1643a4764b1a Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 16 Sep 2022 11:45:14 +0800 Subject: [PATCH] npe --- .../io/renren/common/controller/AbilityCenterControllerV3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9f04c6c..9c5f61c6 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 @@ -314,7 +314,7 @@ public class AbilityCenterControllerV3 { put("_id", applyFlag); //申请id put("creator", user == null ? null : user.getId().toString()); // 创建人 put("userId", user == null ? null : user.getId().toString()); // 创建人 - put("userDeptId", user == null ? null : user.getDeptId().toString()); // 发起人部门id + put("userDeptId", user == null ? null : (user.getDeptId() == null ? abilityBatchApplicationDTO.getDeptId().toString() : user.getDeptId().toString())); // 发起人部门id put("basic_facilities", basicFacilities); // 是否为基础设施 // 以下为V3增加 put("city_apply", finalCityApply); // 是否为市级部门发起申请