From dd023953f5e91b29b490b23c7b4c67355591b003 Mon Sep 17 00:00:00 2001
From: ruying408 <1877972603@qq.com>
Date: Wed, 11 Sep 2024 23:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:IAPM7H=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug:IAP7C6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 5 +++++
 .../controller/admin/sys/AdminBaseSysRoleController.java     | 2 +-
 .../base/service/sys/impl/BaseSysDepartmentServiceImpl.java  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8bfe854..6ad64e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@
             <artifactId>weixin-java-mp</artifactId>
             <version>${weixin-java.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-pay</artifactId>
+            <version>${weixin-java.version}</version>
+        </dependency>
         <!-- 微信相关 end-->
         <dependency>
             <groupId>jakarta.servlet</groupId>
diff --git a/src/main/java/com/cool/modules/base/controller/admin/sys/AdminBaseSysRoleController.java b/src/main/java/com/cool/modules/base/controller/admin/sys/AdminBaseSysRoleController.java
index acbf938..51f0993 100644
--- a/src/main/java/com/cool/modules/base/controller/admin/sys/AdminBaseSysRoleController.java
+++ b/src/main/java/com/cool/modules/base/controller/admin/sys/AdminBaseSysRoleController.java
@@ -25,7 +25,7 @@ public class AdminBaseSysRoleController extends BaseController<BaseSysRoleServic
         boolean isAdmin = tokenInfo.getStr("username").equals("admin");
 
         setPageOption(createOp().keyWordLikeFields(BASE_SYS_ROLE_ENTITY.NAME, BASE_SYS_ROLE_ENTITY.LABEL).queryWrapper(QueryWrapper.create().and(qw -> {
-            qw.eq(BASE_SYS_ROLE_ENTITY.USER_ID.getName(), tokenInfo.get("userId")).or(w -> {
+            qw.eq(BASE_SYS_ROLE_ENTITY.USER_ID.getName(), tokenInfo.getLong("userId")).or(w -> {
                 Object o = tokenInfo.get("roleIds");
                 if (o != null) {
                     w.in(BASE_SYS_ROLE_ENTITY.ID.getName(), new JSONArray(o).toList(Long.class));
diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysDepartmentServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysDepartmentServiceImpl.java
index 95fa7ea..2c284cd 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysDepartmentServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysDepartmentServiceImpl.java
@@ -34,6 +34,7 @@ public class BaseSysDepartmentServiceImpl extends
         list.forEach(baseSysDepartmentEntity -> {
             UpdateChain.of(BaseSysDepartmentEntity.class)
                 .set(BaseSysDepartmentEntity::getOrderNum, baseSysDepartmentEntity.getOrderNum())
+                .set(BaseSysDepartmentEntity::getParentId, baseSysDepartmentEntity.getParentId())
                 .eq(BaseSysDepartmentEntity::getId, baseSysDepartmentEntity.getId()).update();
         });
     }