From ffc50d168847df14f38f64612f55a6dd81d6a7c3 Mon Sep 17 00:00:00 2001 From: didiyu <1293722656@qq.com> Date: 星期四, 22 十一月 2018 09:38:39 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/actions/BattInfAction.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java index ee929e1..698536a 100644 --- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java +++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java @@ -380,14 +380,15 @@ //璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙-----------> public String searchInform_ky(){ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶 - //System.out.println(key+"@@@@@@@@@@@@@@@@@@@@@@"); ServiceModel model = new ServiceModel(); - if(key != null && CROSS_DOMAIN_KEY.equals(key)){ - model = service.searchInform_ky(); - }else{ - model.setCode(0); - model.setMsg("璇嗗埆鐮侀敊璇�"); - } + model = service.searchInform_ky(); + result = ActionUtil.tojson(model); + return SUCCESS; + } + //棣栭〉涓婃樉绀哄凡瀹夎鏁板拰鍏ㄩ儴鍩虹珯鏁� + public String serchDevice(){ + User_inf uinf=(User_inf) getUser(); + ServiceModel model = service.serchDevice(uinf); result = ActionUtil.tojson(model); return SUCCESS; } -- Gitblit v1.9.1