From eec61b51d7b64695d177c7cedd2da49f03f8c26e Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 13 三月 2025 16:59:17 +0800 Subject: [PATCH] update --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java index d4dd1eb..87be894 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java @@ -1,7 +1,5 @@ package org.jeecg.modules.dnc.service.impl; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -11,7 +9,6 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.dnc.entity.*; import org.jeecg.modules.dnc.exception.ExceptionCast; -import org.jeecg.modules.dnc.mapper.PartsInfoMapper; import org.jeecg.modules.dnc.mapper.WorkStepMapper; import org.jeecg.modules.dnc.response.CommonCode; import org.jeecg.modules.dnc.response.ProcessInfoCode; @@ -53,6 +50,9 @@ @Autowired private IProductPermissionService productPermissionService; + + @Autowired + private IProductMixService productMixService; @Override public List<WorkStep> getByUserPerms(String userId) { @@ -137,11 +137,10 @@ ExceptionCast.cast(CommonCode.FAIL); } } - //娣诲姞鐢ㄦ埛鏉冮檺 - b = productPermissionService.add(workStep.getId(), userId,"6"); - if (!b) { - ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR); - } + //娣诲姞缁撴瀯鏍� + ProductMix productMix = new ProductMix(Long.parseLong(workStep.getId()),Long.parseLong(workStep.getProcessId()) + ,workStep.getStepName(),workStep.getStepCode(),"6"); + productMixService.save(productMix); //娣诲姞鏉冮檺楠岃瘉 PermissionStreamNew permissionStream = new PermissionStreamNew(); permissionStream.setUserId(userId); @@ -293,6 +292,10 @@ if (!docRelativeList.isEmpty()){ ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DOC); } + boolean b=productMixService.removeById(id); + if(!b) { + ExceptionCast.cast(CommonCode.FAIL); + } return super.removeById(id); } -- Gitblit v1.9.3