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>" +

fs-service/src/main/java/com/fs/statis/dto/ModifyMoreDTO.java

@@ -26,4 +26,6 @@ public class ModifyMoreDTO implements Serializable {
      * 公司id
      */
     private String companyIds;
+
+    private String isAudit;
 }

fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -404,21 +404,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where product_id = #{productId}
     </update>
     <update id="batchModify">
-        <foreach collection="productId" separator=";" item="item">
-            update fs_store_product_scrm set
-                    <if test="goodsStatus != null">
-                        is_show = #{goodsStatus},
-                    </if>
-                    <if test="goodsIsShow != null">
-                        is_display = #{goodsIsShow},
-                    </if>
-                    <if test="companyIds != null and companyIds != ''">
-                        company_ids = #{companyIds}
-                    </if>
-                    <if test="isAudit != null and isAudit != ''">
-                        is_audit = #{isAudit}
-                    </if>
-            where product_id = #{item}
+        update fs_store_product_scrm
+        <set>
+            <if test="goodsStatus != null">
+                is_show = #{goodsStatus},
+            </if>
+            <if test="goodsIsShow != null">
+                is_display = #{goodsIsShow},
+            </if>
+            <if test="companyIds != null and companyIds != ''">
+                company_ids = #{companyIds},
+            </if>
+            <if test="isAudit != null and isAudit != ''">
+                is_audit = #{isAudit}
+            </if>
+        </set>
+        where product_id in
+        <foreach collection="productId" item="item" open="(" close=")" separator=",">
+            #{item}
         </foreach>
     </update>
 

fs-user-app/src/main/java/com/fs/app/controller/store/IndexScrmController.java

@@ -72,8 +72,7 @@ public class IndexScrmController extends AppBaseController {
 	@ApiOperation("读取菜单数据")
 	@GetMapping("/getMenu")
 	@Cacheable("menu")
-	public R getMenu(HttpServletRequest request){
-		FsMenuScrm map=new FsMenuScrm();
+	public R getMenu(FsMenuScrm map){
 		map.setIsShow(1);
 		map.setMenuType(1);
 		List<FsMenuScrm> list=menuService.selectFsMenuList(map);