From ca29db1e26eb3fcdba0080c675a3b54ef55fbc3f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 12 Jun 2025 05:40:39 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisSupplierController.java | 12 +++++++++++-
 .../main/resources/mapper/EmisSupplierMapper.xml    | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
index 620f5595f..a44e1f9e1 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
@@ -11,11 +11,14 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +35,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisSupplier;
@@ -57,6 +59,14 @@ public class EmisSupplierController extends BaseController
     {
         setPrivParams(emisSupplier);
 
+        if(!StringUtils.isEmpty(emisSupplier.getCode())){
+            emisSupplier.setCode(WaybillHelper.formatQueryValue(emisSupplier.getCode()));
+            String[] codeSortList = emisSupplier.getCode().split(",");
+            if(codeSortList.length>1){
+                emisSupplier.getParams().put("codeSortList", Arrays.asList(codeSortList));
+            }
+        }
+
         startPage();
         List<EmisSupplier> list = emisSupplierService.selectEmisSupplierList(emisSupplier);
         return getDataTable(list);
diff --git a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
index 32b439ebb..094648f30 100644
--- a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
@@ -73,7 +73,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
 
         </where>
-        order by create_time desc
+
+        <if test="params.codeSortList != null ">
+            ORDER BY  FIELD
+            <foreach collection="params.codeSortList" item="item" open="(code," separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="params.codeSortList == null  ">
+            ORDER BY  create_time desc
+        </if>
+
     </select>
 
     <select id="checkUnique" parameterType="EmisSupplier"  resultType="int">