From 57b3c370cf638bad3d5cddd9739cd3f7bc011bc9 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 21 十二月 2023 16:07:11 +0800
Subject: [PATCH] 核容装置记录日志

---
 src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java b/src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java
index ef70c3a..145b8b4 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java
@@ -21,19 +21,19 @@
     public Response getBattSetLog(CKPowerDevBattSetLog battSetLog) {
         PageHelper.startPage(battSetLog.getPageCurr(),battSetLog.getPageSize());
         QueryWrapper wrapper=new QueryWrapper();
-        if(battSetLog.getDevType()!=null){
+        if(battSetLog.getDevType()!=null&&!battSetLog.getDevType().equals("")){
             wrapper.eq("dev_type",battSetLog.getDevType());
         }
-        if(battSetLog.getCmdType()!=null){
+        if(battSetLog.getCmdType()!=null&&battSetLog.getCmdType()!=-1){
             wrapper.eq("cmd_type",battSetLog.getDevType());
         }
         if(battSetLog.getParamCn()!=null){
             wrapper.eq("param_cn",battSetLog.getDevType());
         }
-        if(battSetLog.getCreateTime()!=null){
+        if(battSetLog.getCreateTime()!=null&&!battSetLog.getCreateTime().equals("")){
             wrapper.ge("create_time",battSetLog.getCreateTime());
         }
-        if(battSetLog.getCreateTime1()!=null){
+        if(battSetLog.getCreateTime1()!=null&&!battSetLog.getCreateTime1().equals("")){
             wrapper.le("create_time",battSetLog.getCreateTime1());
         }
         wrapper.orderByDesc("create_time");

--
Gitblit v1.9.1