From 53ce8de426561e7a43847afda23b5e24e6f76c4e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 19 一月 2026 17:29:55 +0800
Subject: [PATCH] 2026.1.19 1. 新增可配置的台账提交期限 2. 新增可配置的自巡查承诺
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
index 5548748..4e3b176 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
@@ -303,7 +303,7 @@
val districtName = condition.districtName ?: user?.extension1
val p = PageHelper.startPage<Userinfo>(page, perPage)
- val result = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
+ val userInfoList = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
if (condition.searchText?.isNotBlank() == true) {
and(createCriteria()
.orLike("acountname", "%${condition.searchText}%")
@@ -321,8 +321,13 @@
.andEqualTo("isenable", true).apply {
condition.userTypeId?.let { andEqualTo("usertypeid", it) }
})
- //todo 2020.8.19 琛楅晣鐨勬潯浠舵煡璇㈤渶瑕佹墿鍏匓aseInfo鏁版嵁琛ㄥ瓧娈靛悗鍐嶅疄鐜�
})
+ //2025.11.28 閫氳繃BaseInfo琛ㄤ腑鐨刡iTownCode瀛楁鏉ョ瓫閫夊嚭绗﹀悎鏉′欢鐨勭敤鎴�
+ val baseInfoList = baseInfoMapper.selectByExample(Example(BaseInfo::class.java).apply {
+ createCriteria().andIn("biGuid", userInfoList.map { it?.guid })
+ }).filter { it.biTownCode == condition.townCode }
+
+ val result = userInfoList.filter { u-> baseInfoList.any { b-> b.biGuid == u?.guid } }
response.setIntHeader("totalPage", p.pages)
response.setIntHeader("currentPage", p.pageNum)
--
Gitblit v1.9.3