pdf生成

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/service/impl/RequestFundsV2ServiceImpl.java

@@ -950,21 +950,20 @@ public class RequestFundsV2ServiceImpl extends BasicsServiceImpl<RequestFundsV2M
     public RequestFundsV2 details(String id) {
 
         RequestFundsV2 requestFundsV2 = getById(id);
-
-        // 获取部门
-        String deptId = requestFundsV2.getDeptId();
-        Map<String, Dept> deptMap = iSysClient.getDeptByIdsToMap(Collections.singletonList(deptId));
-        Dept dept = deptMap.get(deptId);
-        if (dept != null) {
-            requestFundsV2.setDeptName(dept.getDeptName());
-        }
-
-        // 查询公司信息
-        CompanyBasics company = companyBasicsService.getById(requestFundsV2.getCompanyId());
-        if (company != null) {
-            requestFundsV2.setCompanyName(company.getNameChinese());
+        if(ObjectUtil.isNotEmpty(requestFundsV2)){
+            // 获取部门
+            String deptId = requestFundsV2.getDeptId();
+            Map<String, Dept> deptMap = iSysClient.getDeptByIdsToMap(Collections.singletonList(deptId));
+            Dept dept = deptMap.get(deptId);
+            if (dept != null) {
+                requestFundsV2.setDeptName(dept.getDeptName());
+            }
+            // 查询公司信息
+            CompanyBasics company = companyBasicsService.getById(requestFundsV2.getCompanyId());
+            if (company != null) {
+                requestFundsV2.setCompanyName(company.getNameChinese());
+            }
         }
-
         return requestFundsV2;
     }
 

bladex-tool/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java

@@ -10,8 +10,8 @@ public interface NacosConstant {
 	 * nacos 地址
 	 */
 //	String NACOS_ADDR = "127.0.0.1:8848";
-//	String NACOS_ADDR = "139.9.184.42:8848";
-	String NACOS_ADDR = "121.37.194.75:8848";
+	String NACOS_ADDR = "139.9.184.42:8848";
+//	String NACOS_ADDR = "121.37.194.75:8848";
 
 	/**
 	 * nacos 配置前缀