소스 검색

是否查询全部判断

master
huminghao 3 일 전
부모
커밋
4fdd959042
15개의 변경된 파일24개의 추가작업 그리고 24개의 파일을 삭제
  1. 2
    2
      zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractIawManager.java
  2. 1
    1
      zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java
  3. 2
    2
      zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/VehicleInfoManagerImpl.java
  4. 2
    2
      zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java
  5. 2
    2
      zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java
  6. 1
    1
      zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java
  7. 2
    2
      zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java
  8. 1
    1
      zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java
  9. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractManagewManager.java
  10. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java
  11. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundApplyInfoManagerImpl.java
  12. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManagerImpl.java
  13. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManagerImpl.java
  14. 2
    2
      zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/AbstractSettlewManager.java
  15. 2
    2
      zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/issueOrder/IssueOrderRefundManagerImpl.java

+ 2
- 2
zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractIawManager.java 파일 보기

@Autowired @Autowired
protected QdCallUtil qdCallUtil; 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 true;
} }
return false; return false;

+ 1
- 1
zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken()));
if (staff != null){ if (staff != null){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 2
- 2
zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/VehicleInfoManagerImpl.java 파일 보기

if (staff == null){ if (staff == null){
throw new ManagerException("为获取到当前员工账号!"); throw new ManagerException("为获取到当前员工账号!");
} }
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
cardInfos = cardInfoRepo.listByVehicleId(vehicleInfo.getVehicleId()); cardInfos = cardInfoRepo.listByVehicleId(vehicleInfo.getVehicleId());
obuInfos = obuInfoRepo.listByVehicleId(vehicleInfo.getVehicleId()); obuInfos = obuInfoRepo.listByVehicleId(vehicleInfo.getVehicleId());
}else { }else {
if (staff == null){ if (staff == null){
throw new ManagerException("为获取到当前员工账号!"); throw new ManagerException("为获取到当前员工账号!");
} }
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
cardInfos = cardInfoRepo.listByVehicleId(dto.getVehicleId()); cardInfos = cardInfoRepo.listByVehicleId(dto.getVehicleId());
}else { }else {
cardInfos = cardInfoRepo.listByAgencyIdAndVehicleId(findAgencyIdByToken(dto.getAccessToken()),dto.getVehicleId()); cardInfos = cardInfoRepo.listByAgencyIdAndVehicleId(findAgencyIdByToken(dto.getAccessToken()),dto.getVehicleId());

+ 2
- 2
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java 파일 보기

@Autowired @Autowired
private AccountInfoRepo accountInfoRepo; 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 true;
} }
return false; return false;

+ 2
- 2
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }
Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 1
- 1
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(req.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(req.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 2
- 2
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }
Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 1
- 1
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java 파일 보기

// 如果不是管理员,已及非黔通的只能查询本渠道的仓库 // 如果不是管理员,已及非黔通的只能查询本渠道的仓库
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
req.setAgencyId(staff.getAgencyId()); req.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
req.setAgencyId(null); req.setAgencyId(null);
} }
} }

+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractManagewManager.java 파일 보기

@Autowired @Autowired
protected IssueOrderinfoRepo issueOrderinfoRepo; 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 true;
} }
return false; return false;

+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java 파일 보기

throw new ManagerException("为获取到当前员工账号!"); throw new ManagerException("为获取到当前员工账号!");
} }
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
return repo.page(pageRequest).convertResult(this::toModel); return repo.page(pageRequest).convertResult(this::toModel);

+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundApplyInfoManagerImpl.java 파일 보기

throw new ManagerException("为获取到当前员工账号!"); throw new ManagerException("为获取到当前员工账号!");
} }
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
return refundApplyInfoRepo.page(pageRequest); return refundApplyInfoRepo.page(pageRequest);

+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }
Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (staff != null){ if (staff != null){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

+ 2
- 2
zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/AbstractSettlewManager.java 파일 보기

@Autowired @Autowired
private AccountInfoRepo accountInfoRepo; 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 true;
} }
return false; return false;

+ 2
- 2
zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/issueOrder/IssueOrderRefundManagerImpl.java 파일 보기

Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }
Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken())); Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
if (ObjectUtils.isNotEmpty(staff)){ if (ObjectUtils.isNotEmpty(staff)){
pageRequest.setAgencyId(staff.getAgencyId()); pageRequest.setAgencyId(staff.getAgencyId());
if (isManager(staff.getIdentityType(), staff.getAgencyId())){
if (isManager(staff.getAgencyId())){
pageRequest.setAgencyId(null); pageRequest.setAgencyId(null);
} }
} }

Loading…
취소
저장