From 58b691e9cfe1e5e1ae8a62c8b66f1995eaad0e9e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 27 二月 2025 15:07:32 +0800
Subject: [PATCH] 导出osd问题 以及缺少小时改分钟
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index aa2682d..80320a1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -8,7 +8,11 @@
import com.ycl.platform.mapper.ContractResultMapper;
import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
+import com.ycl.system.entity.BaseEntity;
+import com.ycl.system.entity.SysRole;
+import com.ycl.system.entity.SysUser;
import com.ycl.utils.SecurityUtils;
+import enumeration.general.PublishType;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,6 +20,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -51,14 +56,31 @@
*/
@Override
public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
- Integer unitId = SecurityUtils.getUnitId();
- Long uid = null;
- if (Objects.nonNull(unitId)) {
- uid = Long.valueOf(unitId);
+ //閬垮厤鏌ヨ鏉′欢澶辨晥
+ if (contractResult.getUnitId() == null) {
+ Integer unitId = SecurityUtils.getUnitId();
+ Long uid = null;
+ if (Objects.nonNull(unitId)) {
+ uid = Long.valueOf(unitId);
+ }
+ contractResult.setUnitId(uid);
}
- contractResult.setUnitId(uid);
+ roleControl(contractResult);
return checkResultMapper.selectCheckResultList(contractResult);
}
+
+ private void roleControl(ContractResultVO contractResult) {
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (!user.isAdmin()) {
+ for (SysRole role : roles) {
+ if (role.getPermissions().contains("check:contract:role:publish")) {
+ contractResult.setPublish(1);
+ }
+ }
+ }
+ }
+
/**
* 鏂板鑰冩牳缁撴灉
@@ -119,9 +141,11 @@
@Override
public Boolean publish(Long id) {
+ ContractResult contractResult = checkResultMapper.selectById(id);
+
return new LambdaUpdateChainWrapper<>(checkResultMapper)
.eq(ContractResult::getId, id)
- .set(ContractResult::getPublish, 1)
+ .set(ContractResult::getPublish, contractResult.getPublish() == 0 ? 1 : 0)
.set(ContractResult::getPublishId, SecurityUtils.getLoginUser().getUserId())
.update();
}
--
Gitblit v1.8.0