From 9d157d17d53a07824c1566320c426d97b971954a Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Mon, 15 Dec 2025 11:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BB=8A=E6=97=A5=E5=BA=94?=
 =?UTF-8?q?=E6=80=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renkang/emergency/service/impl/TblUserHelpServiceImpl.java | 2 +-
 .../jeecg/modules/system/service/impl/SysUserServiceImpl.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
index 5aa7172..ce9fb9f 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
@@ -116,7 +116,7 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
                     queryWrapper.apply("DATE_FORMAT(help_time,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
                     break;
                 case "4":
-                    queryWrapper.apply("YEARWEEK(date_format(help_time,'%Y-%m-%d')) = YEARWEEK(now())");
+                    queryWrapper.apply("YEARWEEK(date_format(help_time,'%Y-%m-%d'), 1) = YEARWEEK(now(), 1)");
                     break;
             }
         }
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 33365bf..97ba77b 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -2857,6 +2857,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public List<SysUser> getUserByPhoneList(List<String> phoneList) {
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysUser::getDelFlag, 0);
+        queryWrapper.eq(SysUser::getStatus, 1);
+        queryWrapper.eq(SysUser::getPersonType, 1);
         queryWrapper.in(SysUser::getPhone, phoneList);
         return list(queryWrapper);
     }