From 425675051e544cf29b2132615cfbf7a93dc5e51f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 六月 2022 15:50:59 +0800
Subject: [PATCH] fix(dm): MySQL=》DMSQL
---
src/cn/ksource/web/controller/business/pages/incident/IncidentController.java | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/src/cn/ksource/web/controller/business/pages/incident/IncidentController.java b/src/cn/ksource/web/controller/business/pages/incident/IncidentController.java
index a8dac5a..87f1218 100644
--- a/src/cn/ksource/web/controller/business/pages/incident/IncidentController.java
+++ b/src/cn/ksource/web/controller/business/pages/incident/IncidentController.java
@@ -1,14 +1,19 @@
package cn.ksource.web.controller.business.pages.incident;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.ksource.beans.SC_PARTNER_CUSTOMER_INFO;
+import cn.ksource.beans.SC_SERVCE_CATEGORY;
+import cn.ksource.beans.SC_WORKFLOW_INCIDENT;
+import cn.ksource.beans.WORKFLOW_BASE;
+import cn.ksource.core.page.PageInfo;
+import cn.ksource.core.util.*;
+import cn.ksource.core.web.SysInfo;
+import cn.ksource.core.web.SysInfoMsg;
+import cn.ksource.core.web.WebUtil;
+import cn.ksource.web.Constants;
+import cn.ksource.web.facade.customermanage.CustomerManageFacade;
+import cn.ksource.web.facade.incident.IncidentFacade;
+import cn.ksource.web.facade.order.OrderFacade;
+import cn.ksource.web.service.DataDictionaryService;
import cn.ksource.web.service.message.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -18,25 +23,13 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
-import cn.ksource.beans.SC_PARTNER_CUSTOMER_INFO;
-import cn.ksource.beans.SC_SERVCE_CATEGORY;
-import cn.ksource.beans.SC_WORKFLOW_INCIDENT;
-import cn.ksource.beans.WORKFLOW_BASE;
-import cn.ksource.core.page.PageInfo;
-import cn.ksource.core.util.ConvertUtil;
-import cn.ksource.core.util.DateUtil;
-import cn.ksource.core.util.JsonUtil;
-import cn.ksource.core.util.NumberUtil;
-import cn.ksource.core.util.ParamsMapUtil;
-import cn.ksource.core.util.StringUtil;
-import cn.ksource.core.web.SysInfo;
-import cn.ksource.core.web.SysInfoMsg;
-import cn.ksource.core.web.WebUtil;
-import cn.ksource.web.Constants;
-import cn.ksource.web.facade.customermanage.CustomerManageFacade;
-import cn.ksource.web.facade.incident.IncidentFacade;
-import cn.ksource.web.facade.order.OrderFacade;
-import cn.ksource.web.service.DataDictionaryService;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 鏃ュ父杩愮淮--浜嬩欢绠＄悊鎺у埗鍣�
* @note:
@@ -1216,8 +1209,8 @@
baseMsg.put("jjWidth", 150);
}
-
-
+
+
/*List<Map> lzs = incidentFacade.incidentLzRecord(flowId);
modelAndView.addObject("lzs", lzs);*/
@@ -1465,7 +1458,9 @@
String CUSTOMER_ID =ConvertUtil.obj2Str(report.get("CUSTOMER_ID"));
if(StringUtil.notEmpty(CUSTOMER_ID)){
SC_PARTNER_CUSTOMER_INFO customer_INFO=new SC_PARTNER_CUSTOMER_INFO(CUSTOMER_ID).getInstanceById();
- report.put("customer_code", customer_INFO.getCustomer_code());
+ if (customer_INFO != null){
+ report.put("customer_code", customer_INFO.getCustomer_code());
+ }
}
String FIRST_CATEGORY_ID=ConvertUtil.obj2Str(report.get("FIRST_CATEGORY_ID"));
if(StringUtil.notEmpty(FIRST_CATEGORY_ID)){
--
Gitblit v1.9.1