From b0f68c57f7699d083818b9837289e4fb5b7cb25c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 21 五月 2025 09:14:52 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1 - server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index c18629e..2cd7077 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -1951,7 +1951,6 @@ } } - @Override public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>() diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index ca7b409..cc46309 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -1617,7 +1617,8 @@ } if(!( CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) && - loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){ + loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")) + .collect(Collectors.toList()).size()>0)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺"); } this.visitsCancelBiz(visits); @@ -1634,7 +1635,8 @@ .eq(Visits::getId,visits.getId()); //璁垮鎶ュ if(Constants.equalsInteger(visits.getType(),Constants.TWO)){ - if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck) + if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck) + ||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck) || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝鏃犳硶杩涜璇ユ搷浣�"); } -- Gitblit v1.9.3