From 8c7f75ae576beba289b37c0ab30491f5f17ae823 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 10 Jul 2023 09:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3H5=E9=A1=B5=E9=9D=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/mapper/BirReportAccountBookMapper.java | 2 +- .../impl/BirReportAccountBookServiceImpl.java | 15 ++++++++------- .../modules/sys/controller/SysUserController.java | 7 ++++--- 3 files changed, 13 insertions(+), 11 deletions(-) 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 2ffaa228..98aa4c27 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 @@ -25,7 +25,7 @@ public interface BirReportAccountBookMapper { @Select("call get_report_header(#{result, mode=OUT, jdbcType=VARCHAR})") @Options(statementType = StatementType.CALLABLE) @InterceptorIgnore(tenantLine = "true") - void getReportHeader(@Param("result") String headerString); + void getReportHeader(@Param("result") Map map); @Select("call get_tbs_report_region()") @Options(statementType = StatementType.CALLABLE) 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 d0234cf7..c3db1caf 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 @@ -26,10 +26,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.Month; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -44,14 +41,18 @@ public class BirReportAccountBookServiceImpl implements BirReportAccountBookServ private final BirReportAccountBookMapper birReportAccountBookMapper; + @Override public BirReportVo getReportAccountBookData(String type){ BirReportVo vo = new BirReportVo(); String headerString = new String(); - birReportAccountBookMapper.getReportHeader(headerString); - - System.out.println(); + Map map = new HashMap(); + map.put("result",""); + birReportAccountBookMapper.getReportHeader(map); + String header = map.get("result"); +// header.split(",") +// vo.setHeaderList(); return vo; } 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);