是否查询全部判断

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractIawManager.java

@@ -47,8 +47,8 @@ public abstract class AbstractIawManager extends AbstractCommManager {
     @Autowired
     protected QdCallUtil qdCallUtil;
 
-    protected Boolean isManager(String identityType, String agencyId) {
-        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+    protected Boolean isManager(String agencyId) {
+        if (MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }
         return false;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java

@@ -43,7 +43,7 @@ public class SatisfactionManagerImpl extends AbstractIawManager implements Satis
             Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken()));
             if (staff != null){
                 pageRequest.setAgencyId(staff.getAgencyId());
-                if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+                if (isManager(staff.getAgencyId())){
                     pageRequest.setAgencyId(null);
                 }
             }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/VehicleInfoManagerImpl.java

@@ -110,7 +110,7 @@ public class VehicleInfoManagerImpl extends AbstractIawManager implements Vehicl
             if (staff == null){
                 throw new ManagerException("为获取到当前员工账号！");
             }
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 cardInfos = cardInfoRepo.listByVehicleId(vehicleInfo.getVehicleId());
                 obuInfos = obuInfoRepo.listByVehicleId(vehicleInfo.getVehicleId());
             }else {
@@ -145,7 +145,7 @@ public class VehicleInfoManagerImpl extends AbstractIawManager implements Vehicl
             if (staff == null){
                 throw new ManagerException("为获取到当前员工账号！");
             }
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 cardInfos = cardInfoRepo.listByVehicleId(dto.getVehicleId());
             }else {
                 cardInfos = cardInfoRepo.listByAgencyIdAndVehicleId(findAgencyIdByToken(dto.getAccessToken()),dto.getVehicleId());

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java

@@ -31,8 +31,8 @@ public abstract class AbstractInvwManager extends AbstractCommManager{
     @Autowired
     private AccountInfoRepo accountInfoRepo;
 
-    protected Boolean isManager(String identityType, String agencyId) {
-        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+    protected Boolean isManager(String agencyId) {
+        if (MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }
         return false;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java

@@ -66,7 +66,7 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
@@ -126,7 +126,7 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

@@ -71,7 +71,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(req.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java

@@ -64,7 +64,7 @@ public class InvwObuDetailsManagerImpl extends AbstractInvwManager implements In
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
@@ -147,7 +147,7 @@ public class InvwObuDetailsManagerImpl extends AbstractInvwManager implements In
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -54,7 +54,7 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
         // 如果不是管理员，已及非黔通的只能查询本渠道的仓库
         if (ObjectUtils.isNotEmpty(staff)){
             req.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 req.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractManagewManager.java

@@ -35,8 +35,8 @@ public abstract class AbstractManagewManager extends AbstractCommManager {
     @Autowired
     protected IssueOrderinfoRepo issueOrderinfoRepo;
 
-    protected Boolean isManager(String identityType, String agencyId) {
-        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+    protected Boolean isManager(String agencyId) {
+        if (MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }
         return false;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

@@ -44,7 +44,7 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
             throw new ManagerException("为获取到当前员工账号！");
         }
         pageRequest.setAgencyId(staff.getAgencyId());
-        if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+        if (isManager(staff.getAgencyId())){
             pageRequest.setAgencyId(null);
         }
         return repo.page(pageRequest).convertResult(this::toModel);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundApplyInfoManagerImpl.java

@@ -61,7 +61,7 @@ public class AssRefundApplyInfoManagerImpl extends AbstractManagewManager implem
             throw new ManagerException("为获取到当前员工账号！");
         }
         pageRequest.setAgencyId(staff.getAgencyId());
-        if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+        if (isManager(staff.getAgencyId())){
             pageRequest.setAgencyId(null);
         }
         return refundApplyInfoRepo.page(pageRequest);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManagerImpl.java

@@ -54,7 +54,7 @@ public class IssueOrderRefundManagerImpl extends AbstractManagewManager implemen
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
@@ -104,7 +104,7 @@ public class IssueOrderRefundManagerImpl extends AbstractManagewManager implemen
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManagerImpl.java

@@ -42,7 +42,7 @@ public class SatisfactionManagerImpl extends AbstractManagewManager implements S
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (staff != null){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/AbstractSettlewManager.java

@@ -29,8 +29,8 @@ public abstract class AbstractSettlewManager extends AbstractCommManager{
     @Autowired
     private AccountInfoRepo accountInfoRepo;
 
-    protected Boolean isManager(String identityType, String agencyId){
-        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+    protected Boolean isManager(String agencyId){
+        if (MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }
         return false;

zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/issueOrder/IssueOrderRefundManagerImpl.java

@@ -59,7 +59,7 @@ public class IssueOrderRefundManagerImpl extends AbstractSettlewManager implemen
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
@@ -119,7 +119,7 @@ public class IssueOrderRefundManagerImpl extends AbstractSettlewManager implemen
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
+            if (isManager(staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }