From 71fbc8a5738c6d75df113830199394c0a77cece4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 22 Dec 2018 21:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=20=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=92=8C=E7=A4=BC=E5=93=81=E5=8D=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/depot.html                 | 4 +++-
 erp_web/pages/manage/depotGift.html             | 4 +++-
 src/main/resources/mapper_xml/DepotMapperEx.xml | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html
index b4d40a23..bff55f01 100644
--- a/erp_web/pages/manage/depot.html
+++ b/erp_web/pages/manage/depot.html
@@ -312,6 +312,8 @@
 
     //保存信息
     $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 0;
         if (checkDepotName()) {
             return;
         }
@@ -320,7 +322,7 @@
             type: "post",
             dataType: "json",
             data: ({
-                info: JSON.stringify($("#depotFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {
diff --git a/erp_web/pages/manage/depotGift.html b/erp_web/pages/manage/depotGift.html
index b508ec24..8f11b4c6 100644
--- a/erp_web/pages/manage/depotGift.html
+++ b/erp_web/pages/manage/depotGift.html
@@ -306,6 +306,8 @@
 
     //保存信息
     $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 1;
         if (checkDepotName()) {
             return;
         }
@@ -314,7 +316,7 @@
             type: "post",
             dataType: "json",
             data: ({
-                info: JSON.stringify($("#depotFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {
diff --git a/src/main/resources/mapper_xml/DepotMapperEx.xml b/src/main/resources/mapper_xml/DepotMapperEx.xml
index 1843e404..72a385a6 100644
--- a/src/main/resources/mapper_xml/DepotMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotMapperEx.xml
@@ -14,6 +14,7 @@
         <if test="remark != null">
             and remark like '%${remark}%'
         </if>
+        order by sort asc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>