update

src/main/resources/mapper/product/BaseProduceMapper.xml

@@ -127,7 +127,9 @@
             and t1.service_id =#{request.serveId}
         </if>
         and t1.`status` =1
-        and t5.store_id = #{request.departmentId}
+        <if test="request.departmentId !=null ">
+            and t5.store_id = #{request.departmentId}
+        </if>
         <choose>
             <when test="request.sort == 1 ">
                 order by t1.sales_num desc

src/main/resources/mapper/product/BaseServeMapper.xml

@@ -174,8 +174,10 @@
         <if test="baseServe.labelId != null ">
             and t2.features_id = #{baseServe.labelId}
         </if>
+        <if test="baseServe.departmentId != null ">
+            and t3.store_id = #{baseServe.departmentId}
+        </if>
         and has_purchase_show=1
-        and t3.store_id = #{baseServe.departmentId}
         order by purchase_show_index desc
     </select>
 </mapper>