From 130d37e7cd708c005132f184fc18e4579ed30fd6 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Tue, 18 Oct 2022 14:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E6=89=8B=E5=86=8C=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=AD=EF=BC=8C=E9=80=82=E7=94=A8=E8=8C=83=E5=9B=B4=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/output/zd/report1/Report1Gener.java   | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
index ba5faf84..2ad6d072 100644
--- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
+++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
@@ -531,10 +531,8 @@ public class Report1Gener {
 		Map<String, String> contentMap = getContentData(repositoryId, controlShapeId);
 		String listDef = contentMap.get("listDef");
 		String contentXml = contentMap.get("content");
-
 		// 流程步骤的指标表格
 		setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
-
 		if (search != null && search.size() > 0) {
 			// 复制附件
 //			int index = 1;
@@ -566,6 +564,7 @@ public class Report1Gener {
 		}
 		JSONArray termTable = new JSONArray(); //术语定义Table
 		// 属性特征 属性代码KEY
+		try {
 		PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
 		String termVal = term.getPropertyValue();
 		JSONObject termObj = JSONObject.parseObject(termVal);
@@ -585,28 +584,36 @@ public class Report1Gener {
 				}
 			}
 		}
-
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		JSONArray organizationTable = new JSONArray(); //组织职责Table
 		// 属性特征 属性代码KEY
-		PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
-		String OrganizationalVal = Organizational.getPropertyValue();
-		JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
-		if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
-			JSONArray tableArr = OrganizationalObj.getJSONArray("table");
-			if (tableArr != null && !tableArr.isEmpty()) {
-				for (Object obj : tableArr) {
-					JSONObject obj2 = (JSONObject) obj;
-					if (!"table_head".equals(obj2.getString("id"))) {
-						String name = obj2.getString("name");
-						String desc = obj2.getString("desc");
-						JSONObject tmp = new JSONObject();
-						tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING));
-						tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING));
-						organizationTable.add(tmp);
+		try {
+			PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
+			String OrganizationalVal = Organizational.getPropertyValue();
+			JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
+			if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
+				JSONArray tableArr = OrganizationalObj.getJSONArray("table");
+				if (tableArr != null && !tableArr.isEmpty()) {
+					for (Object obj : tableArr) {
+						JSONObject obj2 = (JSONObject) obj;
+						if (!"table_head".equals(obj2.getString("id"))) {
+							String name = obj2.getString("name");
+							String desc = obj2.getString("desc");
+							JSONObject tmp = new JSONObject();
+							tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING));
+							tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING));
+							organizationTable.add(tmp);
+						}
 					}
 				}
 			}
+		} catch (Exception e) {
+			// TODO: handle exception
 		}
+		
 
 		//支持文件
 		JSONArray support_files = new JSONArray(); //组织职责Table
@@ -745,7 +752,7 @@ public class Report1Gener {
 					Timestamp timestamp = UtilDate.parseTsFromDateTime(val);
 					val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日";
 				} catch (Exception e) {
-					e.printStackTrace();
+					//e.printStackTrace();
 				}
 			}
 			obj.put(attr, val);