diff --git a/pom.xml b/pom.xml index 8bfe854..6ad64e3 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,11 @@ weixin-java-mp ${weixin-java.version} + + com.github.binarywang + weixin-java-pay + ${weixin-java.version} + jakarta.servlet 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 { - 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(); }); }