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/ram/Fbs9100_stateAction.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index 6a2e01d..3762e11 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -111,12 +111,15 @@
}
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
- public String serchByCondition_ky(){
- HttpServletResponse res = ActionUtil.getResponse();
- res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
- res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
- res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
- ServiceModel model = service.serchByCondition_ky();
+ public String serchByCondition_ky(){
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ model = service.serchByCondition_ky();
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result = tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1