Browse Source

Merge remote-tracking branch 'origin/v1.0' into v1.0

# Conflicts:
#	src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java
#	src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
contract
15989082884@163.com 2 years ago
parent
commit
d6caf3cf33
  1. 1
      src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java
  2. 1
      src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
  3. 7
      src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

1
src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java

@ -27,6 +27,7 @@ public interface BirReportAccountBookMapper {
@InterceptorIgnore(tenantLine = "true")
void getReportHeader(Map<String, String> map);
@Select("call get_tbs_report_region()")
@Options(statementType = StatementType.CALLABLE)
@InterceptorIgnore(tenantLine = "true")

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

7
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<SysRole> defaultRole = sysRoleService.getDefaultRole();
List<String> defaultRoleIds = defaultRole.stream().map(SysRole::getId).collect(Collectors.toList());
List<String> menuIds = sysMenuMapper.searchUserMenuIds(sysUser.getId());
List<String> 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);

Loading…
Cancel
Save