Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -112,9 +112,8 @@
         tbco.id = tbm.produce_company_id
         <where>
             tbp.is_delete = 0
-            AND
             <if test="userVO.parentId != 0">
-                tbm.company_id = #{userVO.companyId}
+                AND  tbm.company_id = #{userVO.companyId}
             </if>
             <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
@@ -164,7 +163,6 @@
         tbco.id = tbm.produce_company_id
         <where>
             tbp.is_delete = 0
-            AND
             <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>