收款商戶

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -1701,15 +1701,17 @@ public class MachineManageAction implements IMINAction {
         if(!StringUtils.isNullOrEmpty(accountName)){
             createCriteria.andNameLike("%"+accountName+"%");
         }
-        if(!StringUtils.isNullOrEmpty(accountId)){
-            createCriteria.andUsridEqualTo(accountId);
-        }
         if(!StringUtils.isNullOrEmpty(type)){
             createCriteria.andTypeEqualTo(type);
         }
-        if(!branchId.equals(Constant.DEFAULT_INSTITUTIONS)){
-            createCriteria.andUsridEqualTo(branchId);
+        if(Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(u.getBranchId())){
+            if(!StringUtils.isNullOrEmpty(accountId)){
+                createCriteria.andUsridEqualTo(accountId);
+            }
+        }else{
+            createCriteria.andUsridEqualTo(u.getBranchId());
         }
+        createCriteria.andStateEqualTo("00");
         List<VmHlAccount> businessNumList = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmHlAccountMapper.class).selectByExample(vmHlAccountExample,rows);
 

src/main/java/com/minpay/payManage/action/BusinessNumManageAction.java

@@ -83,12 +83,17 @@ public class BusinessNumManageAction implements IMINAction {
 		if(!StringUtils.isNullOrEmpty(accountName)){
 			createCriteria.andNameLike("%"+accountName+"%");
 		}
-		if(!StringUtils.isNullOrEmpty(accountId)){
-			createCriteria.andUsridEqualTo(accountId);
-		}
 		if(!StringUtils.isNullOrEmpty(type)){
 			createCriteria.andTypeEqualTo(type);
 		}
+		if(Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(u.getBranchId())){
+			if(!StringUtils.isNullOrEmpty(accountId)){
+				createCriteria.andUsridEqualTo(accountId);
+			}
+		}else{
+			createCriteria.andUsridEqualTo(u.getBranchId());
+		}
+		createCriteria.andStateEqualTo("00");
 		List<VmHlAccount> businessNumList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(VmHlAccountMapper.class).selectByExample(vmHlAccountExample,rows);
 

src/main/webapp/admin/businessNumManage/businessNumManage.html

@@ -112,7 +112,7 @@
 		        $.request({
 					action : "../../BusinessNumManageAction/deleteBusinessNum",
 					data : {
-						id : data.accountId
+						id : data.id
 					},
 					success : function(resData) {
 						if (resData.MINStatus == 0) {