3
0

2 Коммитууд 7fa82ff974 ... cc9d1230ec

Эзэн SHA1 Мессеж Огноо
  maqingyang cc9d1230ec merge from origin 11 сар өмнө
  maqingyang 269df4e84c fixed some bugs in cooperator product 11 сар өмнө

+ 10 - 0
src/main/resources/mapper/CooperatorMapper.xml

@@ -44,6 +44,9 @@
         WHERE
             cooperator_info.template_id = #{template_id}
           and field_template_ref.is_deleted=0
+        and field_define.is_deleted=0
+        and cooperator_info.is_deleted=0
+        and field_template.is_deleted=0
         order by field_template_ref.create_time desc
 
 
@@ -66,6 +69,11 @@
         WHERE
             cooperator_info.cooperator_num = #{cooperatorNum}
             and field_template_ref.is_deleted=0
+            and field_define.is_deleted=0
+            and cooperator_info.is_deleted=0
+            and field_template.is_deleted=0
+
+
         order by field_template_ref.create_time desc
 
     </select>
@@ -99,6 +107,8 @@
                 LEFT JOIN model ON model.id = prd_product.model_id
         WHERE
             prd_product.cooperator_num = #{cooperatorNum}
+        and prd_product.is_deleted=0
+        and model.is_deleted=0
 
 
     </select>

+ 3 - 1
src/main/resources/mapper/CooperatorProductMapper.xml

@@ -47,10 +47,12 @@
         field_define.create_time,
             product_field_ref.id
         FROM
-            field_define
+         field_define
         LEFT JOIN  product_field_ref ON product_field_ref.field_no = field_define.field_no
+
         WHERE product_field_ref.product_num = #{productNum}
         and product_field_ref.is_deleted = 0
+        and field_define.is_deleted=0
     </select>
 
     <insert id="Apply">