From d7fc8234b4995014acbd52bf33b4bda3c566807a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十一月 2024 15:56:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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 7f493e7..78e572f 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
@@ -17,6 +17,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
@@ -40,7 +41,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -103,44 +103,32 @@
private PlatformReasonMapper platformReasonMapper;
@Autowired
private PlatformGroupMapper platformGroupMapper;
-
-
@Autowired
private ParksMapper parksMapper;
-
@Autowired
private ParkBookMapper parkBookMapper;
-
@Autowired
private VisitParkMapper visitParkMapper;
-
@Autowired
private SmsConfigMapper smsConfigMapper;
-
@Autowired
private SmsEmailMapper smsEmailMapper;
-
@Autowired
private EmayService emayService;
-
-
@Override
public Integer create(Approve approve) {
approveMapper.insert(approve);
return approve.getId();
}
-
@Override
public void deleteById(Integer id) {
approveMapper.deleteById(id);
}
-
@Override
public void delete(Approve approve) {
UpdateWrapper<Approve> deleteWrapper = new UpdateWrapper<>(approve);
approveMapper.delete(deleteWrapper);
}
-
@Override
public void deleteByIdInBatch(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
@@ -791,6 +779,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
+ if(Objects.isNull(objLevel)||Objects.isNull(companyId)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
Company auditCompany = companyMapper.selectById(companyId);
Integer queryLevel = Constants.ONE;
while(queryLevel<objLevel){
@@ -1705,7 +1696,7 @@
if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ZERO)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.eq(CarDriver::getMemberId,approveDTO.getDriverId()));
if(Objects.isNull(carDriver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
--
Gitblit v1.9.3