From 7f9273568d9341948ed0286077e1521bb29bff4b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 10:10:14 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 62379b0..41dc926 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -637,13 +637,15 @@
List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId);
List<Approve> copyList = getAllCopyList(approveGroupList);
//閬嶅巻level鏌ヨ姣忎竴绾у埆涓氬姟鏁版嵁
- for(Approve level:levelList){
- List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
- approveDateVO.getApproveList().addAll(tlist);
- if(tlist.size() ==0
- ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
- ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
- break;
+ if(levelList!=null){
+ for(Approve level:levelList){
+ List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
+ approveDateVO.getApproveList().addAll(tlist);
+ if(tlist.size() ==0
+ ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
+ ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
+ break;
+ }
}
}
@@ -799,7 +801,7 @@
}
}
if(CollectionUtils.isEmpty(approveList)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
+ // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
}
return approveList;
}
--
Gitblit v1.9.3