From 26295a52d1dc420ecf62d0f159f096b22eace25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 16 Nov 2017 21:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/action/materials/DepotHeadAction.java   | 13 +++++++++++--
 .../java/com/jsh/dao/materials/DepotHeadDAO.java    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
index 60e487ca..2bf055cd 100644
--- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java
+++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
@@ -389,8 +390,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 			pageUtil.setCurPage(0);
 			depotHeadService.getHeaderIdByMaterial(pageUtil, materialParam);
 			JSONObject outer = new JSONObject();
-			String allReturn = pageUtil.getPageList().toString();
-			allReturn = allReturn.substring(1,allReturn.length()-1);
+			String allReturn = "";
+			List dataList = pageUtil.getPageList();
+			if(dataList!=null) {
+				System.out.println("dataList:"+ dataList.size());
+				for (Integer i = 0; i < dataList.size(); i++) {
+					Object dl = dataList.get(i); //获取对象
+					allReturn = allReturn + dl.toString() + ",";
+				}
+			}
+			allReturn = allReturn.substring(0,allReturn.length()-1);
 			if(allReturn.equals("null")){
 				allReturn = "";
 			}
diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
index 7b8acc38..fc742bfe 100644
--- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
+++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
@@ -161,7 +161,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
     @SuppressWarnings("unchecked")
     public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select group_concat(CAST(dt.HeaderId AS CHAR)) as ids from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where m.`Name` "+
+        queryString.append("select dt.HeaderId from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where m.`Name` "+
                 " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%'");
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setPageList(query.list());