From b1d5e0d7aadc91ce1415290915868694bd766dfd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Jul 2021 17:32:13 +0800
Subject: [PATCH] 添加时间筛选

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 10d60be..feddfea 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -253,7 +253,7 @@
 			String substring = addr.substring(addr.length() - 4, addr.length());
 			if (substring.equals(".mp4")) {
 				arlistm.add(addr);
-			} else if (substring.equals(".jpg")) {
+			} else if (substring.equals(".jpg") || substring.equals("JPEG")) {
 				arlistj.add(addr);
 			}
 		}
@@ -287,7 +287,7 @@
 
 		feedbackService.save(feedback);
 		Wj wj = new Wj();
-		if (feedback.getSpaddress().equals("")&&feedback.getSpaddress().equals(null)) {
+		if (feedback.getSpaddress().equals("")&&feedback.getSpaddress()!=null) {
 
 		} else {
 			//获取视频地址
@@ -298,7 +298,7 @@
 				iWjService.insertfeed(wj);
 			}
 		}
-		if (feedback.getTpaddress().equals("")&&feedback.getTpaddress().equals(null)){
+		if (feedback.getTpaddress().equals("")&&feedback.getTpaddress()!=null){
 
 		}
 		else {
@@ -310,7 +310,7 @@
 				iWjService.insertfeed(wj);
 			}
 		}
-		alarmService.updateJtype(operation.getJid(), "2", null, null);
+//		alarmService.updateJtype(operation.getJid(), "2", null, null,null);
 
 		return R.success("新增成功");
 	}

--
Gitblit v1.9.3