From e97a387aa5847a4b4f12eacb76d27008c1622120 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 1 Jun 2023 11:43:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
index 3b586bb79..ba5fba762 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
@@ -13,7 +13,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeptDO>()
-                .eq(DeptDO::getTenantId,reqVO.getTenantId())
+                .eq(null != reqVO.getTenantId(), DeptDO::getTenantId, reqVO.getTenantId())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
     }

From a1f6946fc4ea99d107bae69c29ac3cba055dbb66 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 1 Jun 2023 11:45:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/service/dept/DeptServiceImpl.java      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index ab6eca2b6..6d34d8d50 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -154,15 +154,6 @@ public class DeptServiceImpl implements DeptService {
         deptProducer.sendDeptRefreshMessage();
     }
 
-    public static void main(String[] args) {
-        String words = "创盈云>测试删除1";
-
-        System.out.println("原始字符串是'" + words + "'");
-
-        System.out.println("replace(\"r's\",\"is\")结果：" + words.replace("测试删除1", "测试删除"));
-
-    }
-
     @Override
     public void deleteDept(Long id) {
         // 校验是否存在