YOUHUA

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -240,7 +240,11 @@ public class invCardManageAction implements IMINAction {
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
-//		String branchId = user.getBranchId();
+		String branchIdSession = user.getBranchId();
+		//只能查本机构的
+		if(!"88888888".equals(branchIdSession)) {
+			branchId = branchIdSession;
+		}
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		//获取当前时间
  		Date currentTime = new Date();

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -123,6 +123,7 @@
 			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '91'
+			AND VOD_IS_WINNING != '00'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 			UNION
 			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
@@ -141,6 +142,7 @@
 			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '92'
+			AND VOD_IS_WINNING != '00'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 			UNION
 			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
@@ -159,6 +161,7 @@
 			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_TYPE = '99'
+			AND VOD_IS_WINNING != '00'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 		) vv
 		where 1=1