From 8ad863082097ffdcab4a8e7f426d344a1fe6f892 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:27:02 +0800
Subject: [PATCH] 修复人员管理接口校验与导出，完善设备保养计划与文件受控功能
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
index e34c522..c5f0c12 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
@@ -8,6 +8,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.personnel.dto.PersonJobResponsibilitiesDto;
import com.ruoyi.personnel.mapper.PersonJobResponsibilitiesMapper;
import com.ruoyi.personnel.pojo.PersonJobResponsibilities;
@@ -47,18 +48,31 @@
@Override
public void exportPersonJobResponsibilities(Integer id, HttpServletResponse response) {
+ if (id == null) {
+ throw new ErrorException("缂哄皯宀椾綅鑱岃矗id");
+ }
PersonJobResponsibilities personJobResponsibilities = baseMapper.selectById(id);
+ if (personJobResponsibilities == null) {
+ throw new ErrorException("宀椾綅鑱岃矗涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
+ }
+ if (ObjectUtils.isEmpty(personJobResponsibilities.getIncumbentId())) {
+ throw new ErrorException("璇ュ矖浣嶈亴璐ｈ繕娌℃湁閫夋嫨浠昏亴浜猴紝鏆傛棤娉曞鍑�");
+ }
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�");
//宀椾綅鍚嶇О
String name = personJobResponsibilities.getPostName();
+ Integer incumbentUserId = Integer.parseInt(personJobResponsibilities.getIncumbentId());
//鎵�灞為儴闂�
- String departLims = userMapper.selectUserDepartmentLimsName(Integer.parseInt(personJobResponsibilities.getIncumbentId()));
+ String departLims = userMapper.selectUserDepartmentLimsName(incumbentUserId);
//宸ヤ綔鐩爣
String objective = personJobResponsibilities.getJobObjective();
//宀椾綅鑱岃矗
String responsibilities = personJobResponsibilities.getJobResponsibilities();
//浠昏亴浜�
- User user = userMapper.selectById(Integer.parseInt(personJobResponsibilities.getIncumbentId()));
+ User user = userMapper.selectById(incumbentUserId);
+ if (user == null) {
+ throw new ErrorException("浠昏亴浜轰笉瀛樺湪鎴栧凡琚垹闄わ紝璇烽噸鏂伴�夋嫨浠昏亴浜�");
+ }
String incumbent = user.getName();
//浠昏亴鏃堕棿
String incumbentDate = "";
@@ -68,7 +82,8 @@
//涓荤
String supervisor = "";
if (ObjectUtils.isNotEmpty(personJobResponsibilities.getSupervisorId())) {
- supervisor = userMapper.selectById(personJobResponsibilities.getSupervisorId()).getName();
+ User supervisorUser = userMapper.selectById(personJobResponsibilities.getSupervisorId());
+ supervisor = supervisorUser != null ? supervisorUser.getName() : "";
}
//涓荤鏃堕棿
String supervisorDate = "";
--
Gitblit v1.9.3