From df89a5b0c2e19595c7c045bbdfae8a5e86629eb5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 16:02:43 +0800
Subject: [PATCH] 修改委托信息
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 4 +++-
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 1 +
sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
index c157d97..f357bb4 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -56,7 +56,9 @@
QueryWrapper<LinkBasicInformation> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().select(LinkBasicInformation::getId).eq(LinkBasicInformation::getUid, linkBasicInformation.getUid());
LinkBasicInformation linkBasicInformation1 = linkBasicInformationMapper.selectOne(queryWrapper);
- Optional.ofNullable(linkBasicInformation1.getId()).ifPresent(l->{
+ Optional<Integer> optionalId = Optional.ofNullable(linkBasicInformation1)
+ .map(LinkBasicInformation::getId);
+ optionalId.ifPresent(l->{
//鎵ц鍒犻櫎
linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 8a857a0..9a81cae 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -7,6 +7,7 @@
<select id="getLinkBasicPage" resultType="map">
SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
s.name specifications_models,
+ d.spe_name speName,
DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
completionDeadline, l.`contacts`,
DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`,
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
index 3a53c0d..54e2372 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
@@ -97,7 +97,7 @@
boolean b = roleService.hasUrl(String.valueOf(urlType.get("type")), String.valueOf(urlType.get("menuId")), roleId);
if (!b) {
log.warn("鐢ㄦ埛/id锛�" + userInfo.get("name") + "/" + userInfo.get("id") + "---------鏉冮檺涓嶈冻锛屽凡鎷︽埅锛�");
- //throw new AuthException("400","鏃犳潈闄�");
+ throw new AuthException("400","鏃犳潈闄�");
}
} else {
throw new AuthException("401", "鐧婚檰杩囨湡!");
--
Gitblit v1.9.3