From 3d61f6416eb950f267f6adc855f3e19cacbb975b Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 10 Jul 2023 15:47:37 +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 --- .../service/VtbVerificationApplication.java | 20 +++++++++++++++++++ .../qs/serve/modules/wx/api/WxSvcUserApi.java | 18 ++++++++++++++++- .../resources/mapper/bms/BmsChannelMapper.xml | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index af1dde44..9cd1cea2 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -5,7 +5,9 @@ import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.seeyon.entity.CtpAffair; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; +import com.qs.serve.modules.sys.entity.SysPostUser; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; @@ -33,6 +35,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -48,6 +51,7 @@ public class VtbVerificationApplication { private VtbVerificationYardService yardService; private VtbVerificationYardItemService yardItemService; private final TbsActivityPayConditionService activityPayConditionService; + private SysPostUserService sysPostUserService; private TbsActivityService tbsActivityService; private TbsCostApplyService tbsCostApplyService; @@ -315,6 +319,12 @@ public class VtbVerificationApplication { costApplyList = tbsCostApplyService.listByIds(costIds); } } + + + List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + List postUserList = sysPostUserService.listByUserIds(userIds); + Map> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); + List result = new ArrayList<>(); for (CtpAffair ctpAffair : ctpAffairs) { CtpAffairVo ctpAffairVo = new CtpAffairVo(); @@ -341,6 +351,16 @@ public class VtbVerificationApplication { ctpAffairVo.setUserInfo(user.toSysUserVo()); } } + + ctpAffairVo.setAffairInfo(ctpAffair); + for (SysUser user : userList) { + if(ctpAffair.getMemberId().equals(user.getSyUserId())){ + ctpAffairVo.setUserInfo(user.toSysUserVo()); + List postUsers = postMap.get(user.getId()); + ctpAffairVo.setUserPostList(postUsers); + } + } + ctpAffairVo.setAffairInfo(ctpAffair); result.add(ctpAffairVo); } diff --git a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java index 990d5da1..42032aea 100644 --- a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java +++ b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java @@ -17,8 +17,12 @@ import com.qs.serve.common.util.JwtUtils; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.base.TencentYunSmsService; import com.qs.serve.modules.sys.entity.SysDept; +import com.qs.serve.modules.sys.entity.SysRole; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.dto.SysUserVo; +import com.qs.serve.modules.sys.mapper.SysMenuMapper; +import com.qs.serve.modules.sys.service.SysRoleService; +import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; import com.qs.serve.modules.wx.entity.dto.WxPhoneBindParam; @@ -30,8 +34,10 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * 微信：API 微信用户 @@ -49,6 +55,9 @@ public class WxSvcUserApi { private SysUserService sysUserService; private TencentYunSmsService tencentYunSmsService; private SysUserDetailsServiceImpl userDetailsService; + private SysRoleService sysRoleService; + private SysUserSalesService sysUserSalesService; + private final SysMenuMapper sysMenuMapper; /** * 用户信息 @@ -59,8 +68,15 @@ public class WxSvcUserApi { if(StringUtils.hasText(wxUser.getSysUserId())){ SysUser sysUser = sysUserService.getById(wxUser.getSysUserId()); if(sysUser!=null){ + // 解决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); + LoginUser userDetails = userDetailsService.buildLoginUser(sysUser); - sysUser.setAuthorIds(userDetails.getAuthorIds()); + sysUser.setAuthorIds(menuIds); sysUser.setAuthorList(userDetails.getAuthorList()); SysUserVo sysUserVo = sysUser.toSysUserVo(false); wxUser.setSysUserInfo(sysUserVo); diff --git a/src/main/resources/mapper/bms/BmsChannelMapper.xml b/src/main/resources/mapper/bms/BmsChannelMapper.xml index e5ba83b8..c5998f36 100644 --- a/src/main/resources/mapper/bms/BmsChannelMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelMapper.xml @@ -60,6 +60,7 @@ and `bms_channel`.`update_by` = #{query.updateBy} and `bms_channel`.`cost_flag` = #{query.costFlag} + order by bms_channel.id desc