From 0d0f9bf9cc37073d23889c4d8aa8bb5bd038c85f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 16 四月 2025 15:24:18 +0800
Subject: [PATCH] 耐丝配置文件修改
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
index f507f30..b38cc3d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceRecordDto;
import com.ruoyi.device.excel.DeviceRecordExportWord;
import com.ruoyi.device.mapper.DeviceMapper;
@@ -13,6 +14,8 @@
import com.ruoyi.device.pojo.DeviceRecord;
import com.ruoyi.device.service.DeviceRecordService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.system.domain.vo.SysRoleVo;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -40,12 +43,23 @@
@Resource
private DeviceMapper deviceMapper;
+ @Resource
+ private SysRoleMenuMapper sysRoleMenuMapper;
+
@Override
public IPage<DeviceRecordDto> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
// todo:浠呯湅鑷繁
- Integer userId = null;
+ Long userId = SecurityUtils.getUserId();
+ // 鑾峰彇鏉冮檺鍒ゆ柇鏄惁鏄粎鐪嬫垜
+ SysRoleVo sysRoleVo = sysRoleMenuMapper.selectRoleMenu("get:device:record", userId);
- return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, userId);
+ Integer testUserId = null;
+ //娌℃湁浠呯湅鎴戞潈闄愯烦杩�
+ if (sysRoleVo != null && sysRoleVo.getIsRersonal() != null && sysRoleVo.getIsRersonal().equals(1)) {
+ testUserId = SecurityUtils.getUserId().intValue();
+ }
+
+ return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, testUserId);
}
@@ -74,11 +88,12 @@
endTime = deviceRecord.getUseEndDate().format(formatter);
String[] startTimeSplit = startTime.split(" ");
String[] endTimeSplit = endTime.split(" ");
- startTime = startTimeSplit[1];
if (startTimeSplit[0].equals(endTimeSplit[0])) {
+ startTime = startTimeSplit[1];
endTime = endTimeSplit[1];
} else {
endTime = endTimeSplit[0] + '\n' + endTimeSplit[1];
+ startTime = startTimeSplit[0] + '\n' + startTimeSplit[1];
}
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy.M.d");
operationDate = deviceRecord.getUseStartDate().format(formatter2);
--
Gitblit v1.9.3