From 7d174fc58bcc9c136548c789fbdf350a3c6fe52b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 13:11:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index 1f594b2..a78f163 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -15,7 +15,7 @@
import com.fgkj.services.Batttestdata_infService;
import com.opensymphony.xwork2.ActionSupport;
-public class Batttestdata_infAction extends ActionSupport{
+public class Batttestdata_infAction extends ActionUtil{
private Batttestdata_inf bti;
private Batt_Maint_Dealarm bmd;
private ServiceModel model;
@@ -93,9 +93,15 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
public String searchBattTestInfDataById_ky(){
- ActionUtil.isAllowHeaders();
- Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
- model=service.serchByCondition_ky(bti);
+ isAllowHeaders();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
+ model=service.serchByCondition_ky(bti);
+ }else{
+ model = new ServiceModel();
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result=ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1