From ca286722bd6f168364eedadc6326805c04be2103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 29 Apr 2025 10:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/impl/TbProjectServiceImpl.java | 4 ++-- src/main/resources/mappers/basic/TbProjectMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index c280a49..691c115 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -113,7 +113,7 @@ public class TbProjectServiceImpl implements TbProjectService { try { TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data); if (StringUtils.isNotNull(tbProjectVo) && data.getId()!=tbProjectVo.getId()){ - return ServerResponse.createErroe("该项目部下以存在该工程"); + return ServerResponse.createErroe("该项目部下已存在该工程"); } Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); @@ -135,7 +135,7 @@ public class TbProjectServiceImpl implements TbProjectService { try { TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data); if (StringUtils.isNotNull(tbProjectVo)){ - return ServerResponse.createErroe("该项目部下以存在该工程"); + return ServerResponse.createErroe("该项目部下已存在该工程"); } Long userId = UserUtil.getLoginUser().getId(); data.setCreateUserId(userId); diff --git a/src/main/resources/mappers/basic/TbProjectMapper.xml b/src/main/resources/mappers/basic/TbProjectMapper.xml index a479afc..be28aec 100644 --- a/src/main/resources/mappers/basic/TbProjectMapper.xml +++ b/src/main/resources/mappers/basic/TbProjectMapper.xml @@ -98,7 +98,7 @@ select tp.id as id,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength, tp.plan_start_time as planStartTime,tp.plan_end_time as planEndTime,tp.lon as lon,tp.lat as lat, tp.address as address,tp.pro_status as pro_status - from tb_project tp where pro_name = #{proName} and is_active ='1' + from tb_project tp where depart_id = #{departId} and pro_name = #{proName} and is_active ='1'