Merge branch 'master' of http://git.minpay.cc/shouhuobang/adm

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

@@ -238,6 +238,7 @@ public class invCardManageAction implements IMINAction {
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		String branchId = user.getBranchId();
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		//获取当前时间
  		Date currentTime = new Date();
@@ -246,6 +247,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("equNum", equNum);
 		m.put("datesTime", datesTime);
 		m.put("nowDate", nowDate);
+		if(!"88888888".equals(branchId)) {
+			m.put("branchId", branchId);
+		}
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectIncomeDetail(rows, m);
 

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

@@ -68,6 +68,6 @@
 		    	AND SUBSTR(z.VCI_CREATE_TIME,1,8) BETWEEN SUBSTR((#{dates, jdbcType=VARCHAR}),1,8)
 		       			AND substr((#{dates, jdbcType=VARCHAR}),12,19)
 		    </if>
-	 	ORDER BY z.VCI_SORT ASC ,z.VCI_CREATE_TIME ,z.VCI_STATE ="0" DESC
+	 	ORDER BY z.VCI_SORT ASC ,z.VCI_CREATE_TIME DESC,z.VCI_STATE ="0" DESC
 	</select>
 </mapper>

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

@@ -111,6 +111,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('91')
 			AND VOI_ORDER_AMT != '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
 			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
@@ -125,6 +128,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('92')
 			AND VOI_ORDER_AMT != '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
 
@@ -155,6 +161,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('91', '92','93')
 			AND VOI_ORDER_AMT = '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 		) b
 		where 1=1

src/main/webapp/admin/categoryManage/addCategory.html

@@ -98,9 +98,9 @@
 					data :  data.field ,
 					success : function(data) {
 						layer.alert('操作成功!',  function(){
-							 window.parent.location.reload();
-							 cancel();
-						}); 	
+                            window.location.reload();
+                            deleteTabPage('030001-01');
+						});
 					},
 					error : function(data2) {
 	  					layer.alert(data2.MINErrorMessage, {