.

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -58,7 +58,6 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 	public void edit(String warehouseJson, String userInfo, String orgInfoJson) throws Exception {
 
 		JSONObject user = null;
-		JSONObject orgInfo = null;
 		Integer orgId = null;
 		String userName = "";
 
@@ -68,12 +67,6 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
 			userName = user.get("username") == null?"":user.get("username").toString();
 		}
-		//解析单位信息
-		String dwbm = "";
-		if (null != orgInfoJson && !"".equals(orgInfoJson)) {
-			orgInfo = JSONObject.parseObject(orgInfoJson);
-			dwbm = orgInfo.get("creditCode") == null?"":orgInfo.get("creditCode").toString();
-		}
 
 		//获取当前时间
 		Date date = new Date();

src/main/java/com/chinaitop/depot/utils/CustomFilter.java

@@ -49,7 +49,8 @@ public class CustomFilter implements Filter {
 	    	}
 	    	
 	    	arg2.doFilter(requestWrapper, arg1);
-	    } else if (isMultipart(arg0)) {
+//	    } else if (isMultipart(arg0)) {
+	    } else {
 	    	HttpServletRequest request = (HttpServletRequest) arg0;
 	    	HttpSession session = request.getSession();
 	    	String orgId = "";