From 18cf7a6b456cb0f401c48ad16b12de1877541558 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 09:50:34 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java b/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
index b65ea75..cc71771 100644
--- a/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
@@ -5,6 +5,7 @@
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Bts_station_event;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.Batt_devalarm_data_historyService;
import com.fgkj.services.Bts_station_eventService;
@@ -17,6 +18,8 @@
//鏈烘埧浜嬩欢缁熻
public String serchByCondition(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model=service.serchByCondition(binf);
result=tojson(model);
return SUCCESS;
@@ -24,6 +27,8 @@
//鏈烘埧浜嬩欢缁熻
public String serchByInfo(){
Bts_station_event bevent=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Bts_station_event.class);
+ User_inf uinf=(User_inf) getUser();
+ bevent.setNum(uinf.getUId());
ServiceModel model=service.serchByInfo(bevent);
result=tojson(model);
return SUCCESS;
--
Gitblit v1.9.1