zww- 工具接收-工具实例生成BUG修改

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>

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>

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",