Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1444,7 +1444,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             //查询是否绑定小程序
             FsUserWx fsUserWx = fsUserWxService.selectByAppIdAndUserId(param.getAppId(),user.getUserId(),1);
             if (fsUserWx ==null){
-                return R.error("openId参数错误，请清理缓存重新授权");
+                return R.error(401,"openId参数错误，请清理缓存重新授权");
             }else {
                 packetParam.setOpenId(fsUserWx.getOpenId());
             }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -202,6 +202,12 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.storeId != null'> " +
             "and p.store_id = #{maps.storeId}" +
             "</if>" +
+            " <if test = 'maps.cateIds != null and maps.cateIds.size() > 0'>\n" +
+            "        and p.cate_id in \n" +
+            "        <foreach collection='maps.cateIds' item='cateId' open='(' separator=',' close=')'>\n" +
+            "            #{cateId}\n" +
+            "        </foreach>\n" +
+            "    </if>"+
             "<if test = 'maps.defaultOrder != null and maps.defaultOrder==\"desc\"  '> " +
             "order by p.sort desc,product_id desc" +
             "</if>" +
@@ -217,12 +223,7 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.salesOrder != null  and maps.salesOrder==\"asc\" '> " +
             "order by p.sales asc " +
             "</if>" +
-            " <if test = 'maps.cateIds != null and maps.cateIds.size() > 0'>\n" +
-            "        and p.cate_id in \n" +
-            "        <foreach collection='maps.cateIds' item='cateId' open='(' separator=',' close=')'>\n" +
-            "            #{cateId}\n" +
-            "        </foreach>\n" +
-            "    </if>"+
+
             "<if test = 'maps.newOrder != null and maps.newOrder==\"desc\" '> " +
             "and p.is_new =1 order by p.create_time desc  " +
             "</if>" +