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

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

@@ -112,6 +112,7 @@
         tbco.id = tbm.produce_company_id
         <where>
             tbp.is_delete = 0
+            AND
             <if test="userVO.parentId != 0">
                 tbm.company_id = #{userVO.companyId}
             </if>
@@ -163,6 +164,7 @@
         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>