From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java | 7 +++++--
1 files changed, 5 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..615ae41 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
@@ -22,8 +22,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