Merge branch '登录权限部分调整' into uat

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -63,6 +64,9 @@ public class WxPortalController extends ApiBaseController {
     @Autowired
     private ISysUserExtService sysUserExtService;
 
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     @ApiOperation(value = "微信门户首页",notes = "参数：{userId:1}")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params" , paramType = "body")
@@ -70,9 +74,15 @@ public class WxPortalController extends ApiBaseController {
     @PostMapping("/portalData")
     public Object getMagent(){
         ParameterObject obj =  getParameterObject();
-        obj.checkParameterNotNull("userId");
+        obj.checkParameterNotNull("userId,agent");
+        String loginType="";
+        List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label shopType,dict_value shopTypeValue  from sys_dict_data where  dict_type='system_login_type'  and dict_label=?  ",obj.getString("agent"));
+        if(loginTypeList.size()!=0){
+            loginType= loginTypeList.get(0).get("shopTypeValue").toString();
+        }
+
         WxBanner wxBanner = new WxBanner();
-        List<WxMagnet> wxMagnetList =  wxMagnetService.selectMagnetByUserId(obj.getString("userId"), obj.getString("cw"), obj.getString("salesLevel"));
+        List<WxMagnet> wxMagnetList =  wxMagnetService.selectMagnetByUserId(obj.getString("userId"), obj.getString("cw"), obj.getString("salesLevel"),loginType);
         List<WxBanner> wxBannerList = wxBannerService.selectWxBannerList(wxBanner);
         return AjaxResult.success().putKV("magnets",wxMagnetList).putKV("banners",wxBannerList);
     }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/WxMagnetMapper.java

@@ -113,7 +113,7 @@ public interface WxMagnetMapper
      * @param userId
      * @return
      */
-    List<WxMagnet> selectMagnetByUserId(String userId);
+    List<WxMagnet> selectMagnetByUserId(@Param("userId") String userId,@Param("loginType") String  loginType);
 
     List<WxMagnet> selectMagnetByCw(@Param("userId") String userId, @Param("roleId")String roleId);
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IWxMagnetService.java

@@ -110,7 +110,7 @@ public interface IWxMagnetService
      * @param userId
      * @return
      */
-    List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel);
+    List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel,String loginType);
 
     List<WxMagnet> selectWxMagnetRoleByUserId(Long userId,String magnetName);
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -215,7 +215,7 @@ public class WxMagnetServiceImpl implements IWxMagnetService
      * @return
      */
     @Override
-    public List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel) {
+    public List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel,String  loginType) {
 //        List<WxMagnet> list;
 //        if (StringUtils.isNotEmpty(cw) && null != salesLevel && "customer_level".equals(salesLevel)) {
 //            String roleId = cw.equals("1") ? configService.selectConfigByKey("libang.customer.roleid") : configService.selectConfigByKey("libang.cw.roleid");
@@ -223,7 +223,7 @@ public class WxMagnetServiceImpl implements IWxMagnetService
 //        } else {
 //            list = wxMagnetMapper.selectMagnetByUserId(userId);
 //        }
-        List<WxMagnet> list  = wxMagnetMapper.selectMagnetByUserId(userId);
+        List<WxMagnet> list  = wxMagnetMapper.selectMagnetByUserId(userId,loginType);
         if(list!=null && list.size()>0){
             for(WxMagnet wxMagnet: list){
                 logger.info("isEncry::::"+wxMagnet.getIsEncry());

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -186,6 +186,12 @@
         <where>
             ur.user_id = #{userId}
             and m.visible = "0"
+            <if test="loginType != null and loginType != ''">
+                AND ur.shop_type = #{loginType}
+            </if>
+            <if test="loginType == null and loginType == ''">
+                AND ur.shop_type is null
+            </if>
         </where>
         order by  m.order_num
     </select>