From ee010e7160f0a4dee5e0c2fde55d488f4f2f9788 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 六月 2024 09:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 09b02ab..c2230ba 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
@@ -713,7 +713,8 @@
if(Constants.equalsInteger(approve.getType(),Constants.ONE)){
continue;
}
- if(Constants.equalsInteger(approve.getChekorId(),memberId)){
+ if(Constants.equalsInteger(approve.getChekorId(),memberId)
+ &&Constants.equalsInteger(approve.getStatus(), Constants.ONE)){
approveDataVO.setCanBeApproved(Constants.ONE);
approveDataVO.setDriverParam(approve.getDriverParam());
}
@@ -721,11 +722,9 @@
approveList.add(approve);
}
}
-
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
}
-
return approveList;
}
@@ -779,8 +778,6 @@
.orderByAsc(Approve::getLevel)
.orderByAsc(Approve::getId)
);
-
-
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
for (Approve approve:approveAllList ) {
--
Gitblit v1.9.3