权限

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

@@ -262,6 +262,7 @@ public class invCardManageAction implements IMINAction {
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		String branchId = user.getBranchId();
 		Map<String, String> m = new HashMap<String, String>();
 		m.put("machineNo", machineNo);
 		m.put("orderNo", orderNo);
@@ -269,6 +270,7 @@ public class invCardManageAction implements IMINAction {
 		m.put("equrelId", equrelId);
 		m.put("vciId", vciId);
 		m.put("pickupNo", pickupNo);
+		m.put("branchId", branchId);
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectPickupRecord(m,rows);
@@ -306,6 +308,7 @@ public class invCardManageAction implements IMINAction {
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		String branchId = user.getBranchId();
 		Map<String, String> m = new HashMap<String, String>();
 		m.put("machineNo", machineNo);
 		m.put("pickUpCode", pickUpCode);
@@ -313,6 +316,7 @@ public class invCardManageAction implements IMINAction {
 		m.put("creatdDtes", creatdDtes);
 		m.put("pickUpDates", pickUpDates);
 		m.put("pickUpState", pickUpState);
+		m.put("branchId", branchId);
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectOrderDetail(m,rows);

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

@@ -22,6 +22,7 @@
 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
 		and o.VOD_ORDER_ID = d.VOI_ID
+		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
     	<if test="pickupNo != null and pickupNo != ''">
 			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
@@ -66,6 +67,7 @@
 		and VOD_ORDER_ID = oi.VOI_ID
 		and oi.VOI_PERSON_ID = p.VCI_ID
 		and od.VOD_PRO_EQU_REL_ID = r.VCI_ID
+		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		<if test="machineNo != null and machineNo != ''">
 			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>