diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java index c9905d4c..27258b90 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java @@ -27,6 +27,7 @@ public interface BirReportAccountBookMapper { @InterceptorIgnore(tenantLine = "true") void getReportHeader(Map map); + @Select("call get_tbs_report_region()") @Options(statementType = StatementType.CALLABLE) @InterceptorIgnore(tenantLine = "true") diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java index 9624e13b..7e3c3bf4 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java @@ -43,6 +43,7 @@ public class BirReportAccountBookServiceImpl implements BirReportAccountBookServ private final BirReportAccountBookMapper birReportAccountBookMapper; + @Override public BirReportVo getReportAccountBookData(String type){ BirReportVo vo = new BirReportVo(); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index f3960078..4b8a29c0 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -137,16 +137,17 @@ public class SysUserController { LoginUser loginUser = AuthContextUtils.getLoginUser(); SysUser sysUser = sysUserService.getById(loginUser.getUserId()); sysUser.setAuthorList(loginUser.getAuthorList()); - SysUserVo sysUserVo = sysUser.toSysUserVo(false); - SysDept dept = sysDeptService.getById(sysUser.getDeptId()); - sysUserVo.setDeptInfo(dept); //解决H5页面权限不刷新 List defaultRole = sysRoleService.getDefaultRole(); List defaultRoleIds = defaultRole.stream().map(SysRole::getId).collect(Collectors.toList()); List menuIds = sysMenuMapper.searchUserMenuIds(sysUser.getId()); List defaultRoleMenuIds = sysMenuMapper.searchDefaultMenuIds(defaultRoleIds); menuIds.addAll(defaultRoleMenuIds); + //sysUser.setAuthorIds(loginUser.getAuthorIds()); sysUser.setAuthorIds(menuIds); + SysUserVo sysUserVo = sysUser.toSysUserVo(false); + SysDept dept = sysDeptService.getById(sysUser.getDeptId()); + sysUserVo.setDeptInfo(dept); //SysPost sysPost = sysPostService.getById(sysUser.getPositionId()); //sysUserVo.setPostInfo(sysPost);