NCZY/WAI_Project_BACKEND
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug:IAPM7H

Browse Source 
修复bug:IAP7C6
This commit is contained in:
ruying408
2024-09-11 23:21:17 +08:00
parent c70f81812f
commit dd023953f5
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cool/modules/base/controller/admin/sys/AdminBaseSysRoleController.java
View File

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

1
src/main/java/com/cool/modules/base/service/sys/impl/BaseSysDepartmentServiceImpl.java
View File

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