|
|
|
@ -3,6 +3,7 @@ package com.palnet.biz.jpa.repository.flt;
|
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; |
|
|
|
|
import org.springframework.data.domain.PageImpl; |
|
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
|
import org.springframework.stereotype.Repository; |
|
|
|
@ -393,14 +394,13 @@ public class FltPlanQueryRepository {
|
|
|
|
|
return models; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public PageImpl<BasFlightPlanModel> aprvList(BasFlightPlanListRq rq, String userAccount, Pageable pageable) { |
|
|
|
|
public PageImpl<BasFlightPlanModel> aprvList(BasFlightPlanListRq rq, String masterAccount, Pageable pageable) { |
|
|
|
|
QFltPlanBas bas = QFltPlanBas.fltPlanBas; |
|
|
|
|
QFltPlanArea area = QFltPlanArea.fltPlanArea; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
// if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
|
|
|
|
|
if(userAccount != null) { |
|
|
|
|
if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { |
|
|
|
|
if(masterAccount != null) { |
|
|
|
|
if (masterAccount.equals("SPUER") || masterAccount.equals("ADMIN")) { |
|
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
|
} else { |
|
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
@ -463,14 +463,14 @@ public class FltPlanQueryRepository {
|
|
|
|
|
|
|
|
|
|
return new PageImpl<>(r,pageable, r.size()); |
|
|
|
|
} |
|
|
|
|
public long aprvCount(BasFlightPlanListRq rq, String userAccount) { |
|
|
|
|
public long aprvCount(BasFlightPlanListRq rq, String masterAccount) { |
|
|
|
|
QFltPlanBas bas = QFltPlanBas.fltPlanBas; |
|
|
|
|
QFltPlanArea area = QFltPlanArea.fltPlanArea; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
// if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
|
|
|
|
|
if(userAccount != null) { |
|
|
|
|
if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { |
|
|
|
|
if(masterAccount != null) { |
|
|
|
|
if (masterAccount.equals("SUPER") || masterAccount.equals("ADMIN")) { |
|
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
|
} else { |
|
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
|