From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
index 3dbba56..5610585 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
@@ -14,6 +15,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.Date;
@@ -52,6 +54,30 @@
wrapper.eq( SlAuditRecord::getDelFlag,0);
wrapper.orderByAsc(SlAuditRecord::getType);
List<SlAuditRecord> page1 = this.list(wrapper);
+ for (int i = 0; i < page1.size(); i++) {
+ page1.get(i).setIsPlatform(0);
+ SlAudit slAudit = slAuditMapper.selectById(page1.get(i).getAuditId());
+ if (slAudit!=null){
+ String shenhId = slAudit.getAuditUserId();
+ if (StringUtils.hasLength(shenhId)){
+ String[] split = shenhId.split(",");
+ // 取最后一个
+ shenhId = split[split.length - 1];
+ SysUser data = sysUserClient.getSysUser(Long.valueOf(shenhId)).getData();
+ if (data!=null){
+ // 判断当前审核人是不是平台管理员
+ if (data.getUserType().equals("00")){
+ page1.get(i).setIsPlatform(1);
+ }
+ }
+ }
+ }
+ if (page1.get(i).getState() == 3){
+ assert slAudit != null;
+ page1.get(i).setRefuseReason(slAudit.getCause());
+ }
+ }
+
return page1;
}
@@ -61,6 +87,12 @@
SlAuditRecord byId = this.getOne(new QueryWrapper<SlAuditRecord>()
.eq("type", auditRecordDTO.getType())
.eq("audit_id", auditRecordDTO.getAuditId()));
+ String auditUserId = slAudit.getAuditUserId();
+ if (StringUtils.hasLength(auditUserId)){
+ slAudit.setAuditUserId(slAudit.getAuditUserId()+","+SecurityUtils.getUserId());
+ }else{
+ slAudit.setAuditUserId(SecurityUtils.getUserId()+"");
+ }
Long userid = SecurityUtils.getUserId();
SysUser data = sysUserClient.getSysUser(userid).getData();
if (auditRecordDTO.getState()==2){
--
Gitblit v1.7.1