From eaef137e2a787d55f5d31b39ec3a104675368579 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 09:12:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java
index 78f5c67..e37e36c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.constants.AssetDeptConstant;
+import com.ruoyi.system.dto.asset.AdHandleCompleteDTO;
+import com.ruoyi.system.dto.asset.AdUpdateMaterialDTO;
import com.ruoyi.system.mapper.OaApprovalApplicationAdMapper;
import com.ruoyi.system.model.OaApprovalApplicationAd;
import com.ruoyi.system.query.ApprovalApplicationAdQuery;
@@ -14,6 +16,8 @@
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
/**
* <p>
@@ -53,4 +57,65 @@
}
return baseMapper.getPageList(new Page<>(query.getPageNum(), query.getPageSize()), query);
}
+
+ @Override
+ public boolean handleComplete(AdHandleCompleteDTO dto) {
+ // 查询记录是否存在
+ OaApprovalApplicationAd entity = getById(dto.getId());
+ if (entity == null) {
+ return false;
+ }
+
+ // 更新字段
+ entity.setOrderTaker(dto.getOrderTaker());
+ entity.setFileUrl(dto.getFileUrl());
+ entity.setStatus(dto.getStatus());
+ entity.setHandleTime(LocalDateTime.now());
+ return updateById(entity);
+ }
+
+ @Override
+ public boolean updateMaterial(AdUpdateMaterialDTO dto) {
+ // 查询记录是否存在
+ OaApprovalApplicationAd entity = getById(dto.getId());
+ if (entity == null) {
+ return false;
+ }
+
+ // 只更新广告图
+ entity.setFileUrl(dto.getFileUrl());
+
+ return updateById(entity);
+ }
+
+ /**
+ * 检查用户是否有数据权限处理该记录
+ *
+ * @param entity 实体对象
+ * @return 是否有权限
+ */
+ private boolean hasDataPermission(OaApprovalApplicationAd entity) {
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId);
+
+ // 超级管理员有所有权限
+ if (isAdmin) {
+ return true;
+ }
+
+ try {
+ // 获取当前用户的部门名称
+ String deptName = sysUserService.selectUserById(userId).getDeptName();
+
+ // 资产管理部有所有权限
+ if (AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
+ return true;
+ }
+ } catch (Exception e) {
+ // 如果获取部门信息失败,默认无权限
+ return false;
+ }
+
+ return false;
+ }
}
--
Gitblit v1.7.1