From 2fe79ff9ee42b2b4c27d8b15a556ef4a2159febe Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Mon, 30 Jun 2025 15:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=B8=AA=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2orgid=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dal/mysql/device/DeviceMapper.java | 37 ++++++++++++-------
 .../resources/mapper/person/PersonMapper.xml  |  7 ++--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
index fb3ba58bb4..0df266153a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
@@ -22,20 +22,29 @@ import org.apache.ibatis.annotations.Select;
 public interface DeviceMapper extends BaseMapperX<DeviceDO> {
 
     default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
-                .likeIfPresent(DeviceDO::getDevicename, reqVO.getDevicename())
-                .eqIfPresent(DeviceDO::getDevicecode, reqVO.getDevicecode())
-                .eqIfPresent(DeviceDO::getDevicetype, reqVO.getDevicetype())
-                .eqIfPresent(DeviceDO::getLocation, reqVO.getLocation())
-                .eqIfPresent(DeviceDO::getDevicestatus, reqVO.getDevicestatus())
-                .eqIfPresent(DeviceDO::getOrgid, reqVO.getOrgid())
-                .likeIfPresent(DeviceDO::getOrgname, reqVO.getOrgname())
-                .eqIfPresent(DeviceDO::getDescription, reqVO.getDescription())
-                .betweenIfPresent(DeviceDO::getCreatetime, reqVO.getCreatetime())
-                .betweenIfPresent(DeviceDO::getUpdatetime, reqVO.getUpdatetime())
-                .eqIfPresent(DeviceDO::getCreateby, reqVO.getCreateby())
-                .eqIfPresent(DeviceDO::getUpdateby, reqVO.getUpdateby())
-                .orderByDesc(DeviceDO::getId));
+        LambdaQueryWrapperX<DeviceDO> wrapper = new LambdaQueryWrapperX<>();
+
+        wrapper.likeIfPresent(DeviceDO::getDevicename, reqVO.getDevicename());
+        wrapper.eqIfPresent(DeviceDO::getDevicecode, reqVO.getDevicecode());
+        wrapper.eqIfPresent(DeviceDO::getDevicetype, reqVO.getDevicetype());
+        wrapper.eqIfPresent(DeviceDO::getLocation, reqVO.getLocation());
+        wrapper.eqIfPresent(DeviceDO::getDevicestatus, reqVO.getDevicestatus());
+
+        // 手动处理 orgid：只有非 null 且不等于 0 时才添加
+        Integer orgid = reqVO.getOrgid();
+        if (orgid != null && orgid != 0) {
+            wrapper.eq(DeviceDO::getOrgid, orgid);
+        }
+
+        wrapper.likeIfPresent(DeviceDO::getOrgname, reqVO.getOrgname());
+        wrapper.eqIfPresent(DeviceDO::getDescription, reqVO.getDescription());
+        wrapper.betweenIfPresent(DeviceDO::getCreatetime, reqVO.getCreatetime());
+        wrapper.betweenIfPresent(DeviceDO::getUpdatetime, reqVO.getUpdatetime());
+        wrapper.eqIfPresent(DeviceDO::getCreateby, reqVO.getCreateby());
+        wrapper.eqIfPresent(DeviceDO::getUpdateby, reqVO.getUpdateby());
+        wrapper.orderByDesc(DeviceDO::getId);
+
+        return selectPage(reqVO, wrapper);
     }
 
     default PageResult<DeviceDO> selectNotBindPage(DevicePageReqVO reqVO) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml
index 8795c30850..2386d64e6b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml
@@ -35,15 +35,16 @@
         DATE(vipstarttime) AS vip_date,
         COUNT(*) AS count
         FROM tb_user
-        WHERE isvip = 1
         <where>
+            isvip = 1
             <!-- 如果 orgid 不等于 0，则加上 orgid 条件 -->
             <if test="orgid != null and orgid != 0">
                 AND orgid = #{orgid}
             </if>
+            AND vipstarttime >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+            AND vipstarttime &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)
         </where>
-        AND vipstarttime >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
-        AND vipstarttime &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+
         GROUP BY DATE(vipstarttime)
         )
         SELECT