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

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<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+        List<SysPostUser> postUserList = sysPostUserService.listByUserIds(userIds);
+        Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId));
+
         List<CtpAffairVo> 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<SysPostUser> postUsers = postMap.get(user.getId());
+                    ctpAffairVo.setUserPostList(postUsers);
+                }
+            }
+
             ctpAffairVo.setAffairInfo(ctpAffair);
             result.add(ctpAffairVo);
         }

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<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);
+
                 LoginUser userDetails = userDetailsService.buildLoginUser(sysUser);
-                sysUser.setAuthorIds(userDetails.getAuthorIds());
+                sysUser.setAuthorIds(menuIds);
                 sysUser.setAuthorList(userDetails.getAuthorList());
                 SysUserVo sysUserVo = sysUser.toSysUserVo(false);
                 wxUser.setSysUserInfo(sysUserVo);

src/main/resources/mapper/bms/BmsChannelMapper.xml

@@ -60,6 +60,7 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and `bms_channel`.`update_by` = #{query.updateBy}</if>
             <if test="query.costFlag != null"> and `bms_channel`.`cost_flag` = #{query.costFlag}</if>
         </where>
+        order by bms_channel.id desc
     </select>
 
 </mapper>