Merge branch 'master' of http://git.minpay.cc/tudc/guomao

adm/src/main/java/com/minpay/common/event/SSOFilter.java

@@ -67,6 +67,7 @@ public class SSOFilter implements Filter {
 		String userStr = RedisUtil.getString(token);
 		if (CommonUtil.isEmpty(userStr)) {
 			chain.doFilter(request, response);
+			return;
 		}
 		JSONObject userJson = JSONObject.fromObject(userStr);
 		

adm/src/main/java/com/minpay/guomao/giveoutmanage/GiveStockManageAction.java

@@ -211,6 +211,9 @@ public class GiveStockManageAction implements IMINAction {
 			if(orderLogistics == null){
 				throw new MINBusinessException("获取信息失败！");
 			}
+			if(!"00".equals(orderLogistics.getState())) {
+				throw new MINBusinessException("发出量数据状态异常，请重新查询数据后重试！");
+			}
 			String wareDetailId = Service.lookup(IPublicService.class).getSequence("PUT_STOCK_ID");
 			ApWarehouseDetail wareDetail = new ApWarehouseDetail();
 			wareDetail.setId(wareDetailId);