From 1fb4b09dcc8679beb8a3389197670c165ff9056b Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期四, 27 二月 2025 17:56:12 +0800 Subject: [PATCH] 在库项目,隐藏列可操作保存 --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java index 611867a..62ae364 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.ZipUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -142,13 +143,12 @@ * @return */ public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){ - QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>(); + LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>(); if (updateId == null) { - - queryWrapper.eq("project_name", entity.getProjectName()); - + queryWrapper.eq(ProjectInfo::getProjectName, entity.getProjectName()); + queryWrapper.eq(ProjectInfo::getDeleted,0); if (StringUtils.isNotEmpty(entity.getProjectCode())) { - queryWrapper.eq("project_code", entity.getProjectCode()); + queryWrapper.eq(ProjectInfo::getProjectCode, entity.getProjectCode()); } List<ProjectInfo> project = projectInfoMapper.selectList(queryWrapper); @@ -191,6 +191,10 @@ entity.setUpdateBy(userId); //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍� if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) { + entity.setUsedStatus(ProjectConstant.PASS); + } + // 绠$悊鍛樹慨鏀圭殑鐩存帴閫氳繃 + if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) { entity.setUsedStatus(ProjectConstant.PASS); } if(!checkProjectNameAndIdIsUnique(entity,form.getId())){ @@ -807,7 +811,7 @@ @Override @Transactional(rollbackFor = Exception.class) public Result editProject(ProjectForm form) { - Long projectId = null; + Long projectId = form.getProjectInfoForm().getId(); if (ObjectUtil.isNotNull(form.getProjectInfoForm())) { if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) { //鏂板 -- Gitblit v1.8.0