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/Batt_enduranceAction.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
index 2ac9952..32b90d3 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -2,6 +2,7 @@
 
 import com.fgkj.dto.Batt_endurance;
 import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
 import com.fgkj.services.Batt_enduranceService;
 
 public class Batt_enduranceAction extends ActionUtil{
@@ -12,6 +13,8 @@
 	//缁埅鏃堕棿鐨勬煡璇�
 	public String serchByCondition() {
 		Batt_endurance bendurance=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_endurance.class);
+		User_inf uinf=(User_inf) getUser();
+		bendurance.setNum(uinf.getUId());
 		ServiceModel model=service.serchByCondition(bendurance);
 		result=tojson(model);
 		return SUCCESS;

--
Gitblit v1.9.1