Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -130,6 +130,12 @@
         <if test="orgId != null">
             AND org_id != #{orgId}
         </if>
+        <if test="orgCode != null">
+            AND org_code LIKE concat('%',my_ex.likequery(#{orgCode}),'%')
+        </if>
+        <if test="orgName != null">
+            AND org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
         order by display_no
     </select>
 
@@ -490,13 +496,13 @@
         from dkic_b.t_mst_supplier tms
         where tms.cp_id = #{cpId}
         <if test="supplierName!=null and supplierName!=''">
-            AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
+            AND tms.sup_name LIKE concat('%',my_ex.likequery(#{supplierName}),'%')
         </if>
         <if test="supplierCode!=null and supplierCode!=''">
-            AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
+            AND tms.sup_code LIKE concat('%',my_ex.likequery(#{supplierCode}),'%')
         </if>
         <if test="supplierType!=null and supplierType!=''">
-            AND tms.sup_type LIKE concat('%', #{supplierType}, '%')
+            AND tms.sup_type LIKE concat('%',my_ex.likequery(#{supplierType}),'%')
         </if>
         order by tms.sup_code
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -479,7 +479,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         param = this.getLimit(param);
         // 定义返回值
         PageList data = new PageList<>();
-        // 获取公司
+        // 获取供应商
         List<Map<String, Object>> list = commonMapper.getSupplier(param);
         // 获取总数量
         Long total = commonMapper.countSupplier(param);