From 656bd1b190ed296a7bf63623dc8e9fe2bc9d3098 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期五, 19 二月 2021 16:29:49 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java b/src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java
index b9a3f2c..ff2d4ff 100644
--- a/src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/src/main/java/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -71,7 +71,7 @@
 		}
 		return model;	
 	}
-	 //寮瑰嚭妗嗙殑纭畾鎿嶄綔
+	 //寮瑰嚭妗嗙殑纭畾鎿嶄綔 db_ram_db.tb_Fbs9100_setparam鏃犳暟鎹�
 	public ServiceModel update(Fbs9100_setparam fsparam) {
 		ServiceModel model = new ServiceModel();
 		Boolean b=mapper.update(fsparam)>0;
@@ -183,7 +183,7 @@
     //鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟
 	public ServiceModel serchByCondition(BattInf binf){
 		ServiceModel model = new ServiceModel();
-		Integer dev_id=battInfMapper.serchDev_id(binf);
+		Integer dev_id=battInfMapper.serchDev_id(binf);	//db_ram_db.tb_fbs9100_setparam have no data
 		if (null==dev_id){
 			dev_id=-1;
 		}
@@ -277,13 +277,15 @@
 				//鎵цfbs9600鏌ヨ
 				fbs9100 =mapper.getFbs9600ByInfo(battInf);
 			}
-			list.add(fbs9100);
+			if (fbs9100!=null){
+				list.add(fbs9100);
+			}
 		}
-		if(list!=null && list.size()>0){
+		if (list != null && list.size() > 0) {
 			model.setCode(1);
 			model.setData(list);
 			model.setMsg("鏌ヨ鎴愬姛!");
-		}else{
+		} else {
 			model.setCode(0);
 			model.setMsg("鏌ヨ澶辫触!");
 		}	

--
Gitblit v1.9.1