Merge remote-tracking branch 'origin/master'

api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java

@@ -564,10 +564,10 @@ public class IdcServiceImpl implements IdcService {
 
         Map<String, Object> whereParams = new HashMap<String, Object>();
         whereParams.put("sqlWhere", params.get("sqlWhere"));
-        whereParams.put("dataWhere", params.get("dataWhere"));
         
+        String dataWhere  = params.get("dataWhere")!=null ? params.get("dataWhere").toString() : "";
         Map<String, Object> map = new HashMap<String, Object>();
-        String where = DBAUtils.convertWhere(column, whereParams, "");
+        String where = DBAUtils.convertWhere(column, whereParams, dataWhere);
         sql += !StringUtils.isEmpty(where) ? " where " + where : "";
         map.put("sql", sql);
         int total = dbDao.count(map);