修复bug:IAPM7H

修复bug:IAP7C6

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>

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));

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();
         });
     }