From f467042f10736afe6c895e313f12eff86d3d4a9f Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Fri, 29 Oct 2021 11:02:29 +0800
Subject: [PATCH] =?UTF-8?q?zww-=20=E5=B7=A5=E5=85=B7=E6=8E=A5=E6=94=B6-?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=AE=9E=E4=BE=8B=E7=94=9F=E6=88=90BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/app/DepartmentMapper.xml     | 10 +++++-----
 src/main/resources/mapper/toolman/ToolDetailMapper.xml |  2 +-
 src/main/resources/static/js/pda/toolBorrowing.js      |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/app/DepartmentMapper.xml b/src/main/resources/mapper/app/DepartmentMapper.xml
index ac8b6fd..1e7acd0 100644
--- a/src/main/resources/mapper/app/DepartmentMapper.xml
+++ b/src/main/resources/mapper/app/DepartmentMapper.xml
@@ -24,15 +24,15 @@
   </sql>
   <select id="getDepartmentList" resultMap="BaseResultMap">
         <!--@mbg.generated-->
-        select
-        <include refid="Base_Column_List"/>
-        from department
+        select A.id,A.site,A.department_no,A.department_desc,A.active,A.created_by,A.created_date,A.remark,A.update_by
+        ,A.updated_date,A.delflag,A.version
+        from department A
         <where>
             <if test="site != null">
-                and site=#{site,jdbcType=VARCHAR}
+                and A.site=#{site,jdbcType=VARCHAR}
             </if>
             <if test="active != null">
-                and active=#{active,jdbcType=CHAR}
+                and A.active=#{active,jdbcType=CHAR}
             </if>
         </where>
     </select>
diff --git a/src/main/resources/mapper/toolman/ToolDetailMapper.xml b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
index 2086a1a..8ba6ece 100644
--- a/src/main/resources/mapper/toolman/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
@@ -249,7 +249,7 @@
                 and Site=#{site,jdbcType=VARCHAR}
             </if>
             <if test="toolId != null and toolId != ''">
-                and ToolInstanceID LIKE #{toolId,jdbcType=VARCHAR}+'%'
+                and ToolID = #{toolId,jdbcType=VARCHAR}
             </if>
         </where>
     </select>
diff --git a/src/main/resources/static/js/pda/toolBorrowing.js b/src/main/resources/static/js/pda/toolBorrowing.js
index c2644b2..2b3dc1c 100644
--- a/src/main/resources/static/js/pda/toolBorrowing.js
+++ b/src/main/resources/static/js/pda/toolBorrowing.js
@@ -21,6 +21,7 @@ $(function(){
 function initWorkCenter(){
 	var jsonData = {
 		site : site,
+		active : 'Y',
 	}
 	$.ajax({
 		url: "/toolPda/getDepartmentList",