From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 4c324ed..25eeca6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -182,13 +182,14 @@
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
- model.getType().equals(Constants.ZERO)?3:4,
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
memberId);
List<Approve> approveList = approveDataVO.getApproveList();
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- Member member = memberMapper.selectById(model.getCancelUser());
+ Member member1 = memberMapper.selectById(model.getCancelUser());
+
Approve approve = new Approve();
approve.setApproveType(Constants.ZERO);
approve.setCreateDate(model.getCancelTime());
@@ -196,9 +197,11 @@
approve.setStatusInfo("宸叉挙閿�");
approve.setStatus(Constants.FOUR);
approve.setType(Constants.ZERO);
- approve.setMemberName(member.getName());
- if(StringUtils.isNotBlank(member.getFaceImg())){
- approve.setFaceImg(path + member.getFaceImg());
+ if(member1!=null) {
+ approve.setMemberName(member1.getName());
+ if (StringUtils.isNotBlank(member1.getFaceImg())) {
+ approve.setFaceImg(path + member1.getFaceImg());
+ }
}
approve.setCheckInfo(model.getCancelInfo());
approveList.add(approve);
--
Gitblit v1.9.3