modify

Helius

2020-12-27 c0691d2302bbaed2a47b2b703b83ed5bc204e397

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

@@ -466,6 +466,7 @@
      <result property="vipName" column="vipName" />
      <result property="timeLength" column="timeLength" />
      <result property="status" column="status" />
      <result property="staffId" column="staffId" />
      <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
         <result property="projName" column="projName" />
         <result property="beautyName" column="beautyName" />
@@ -483,7 +484,7 @@
         a.state status,
         d.BED_NAME bed,
         e.VIP_NAME vipName,
         b.staff_id staffId,
         a.create_staff_id staffId,
         f.su_name beautyName,
         g.proj_name projName
      from sys_proj_services a
@@ -502,6 +503,9 @@
         </if>
         <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}
         </if>
         <if test="record.userId!=null">
            and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
         </if>
      </where>
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -532,6 +536,9 @@
         <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}
         </if>
         <if test="record.userId!=null">
            and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
         </if>
      </where>
   </select>
</mapper>