Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -1259,6 +1259,9 @@
         <![CDATA[   and ( a.shop_id = #{record.shopId} or
                  (  a.headquarters=1 and  ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
      </if>
      <if test="record.companyId != null and record.companyId !='' ">
         and a.company_id=#{record.companyId}
      </if>
      <if test="record.goodType!=null">
         and a.good_type=#{record.goodType}
      </if>
@@ -1286,8 +1289,21 @@
         <![CDATA[   and ( a.shop_id = #{record.shopId} or
                  (  a.headquarters=1 and  ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
      </if>
      <if test="record.companyId != null and record.companyId !='' ">
         and a.company_id=#{record.companyId}
      </if>
      <if test="record.goodType!=null">
         and a.good_type=#{record.goodType}
      </if>
   </select>

   <select id="selectByIds" resultMap="ShoppingGoodsSimpleMap">
      select
      *
      from shopping_goods
      where id in
      <foreach collection="ids" item="item" separator="," open="(" close=")">
         #{item}
      </foreach>
   </select>
</mapper>