From 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 05 十一月 2025 11:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
index a0f88b0..819944a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
@@ -4,6 +4,7 @@
import com.smartor.mapper.UtilsMapper;
import com.smartor.service.IServiceTelInfoService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,8 +23,11 @@
* @return 缁撴灉
*/
@Override
- public List<Map<String,Object>> getList() {
- List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo where state=0 ");
+ public List<Map<String,Object>> getList(String orgid) {
+ String where=" where (state=0 OR DATE_ADD(editTime, INTERVAL 10 MINUTE)< NOW()) ";
+ if(ObjectUtils.isNotEmpty(orgid))
+ where=where+" and orgid='"+orgid+"'";
+ List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo " +where);
return lists;
}
/**
--
Gitblit v1.9.3