|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.exception.JeecgBootException;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
@@ -106,6 +107,11 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
|
|
|
public void pass(ItdmSaveRunFlowPath saveRunFlowPath) {
|
|
|
|
|
|
ItdmRunFlowPathStep select = this.baseMapper.selectById(saveRunFlowPath.getRunFlowPathStep());
|
|
|
+ if (StringUtils.isBlank(saveRunFlowPath.getSaveData())) {
|
|
|
+
|
|
|
+ throw new JeecgBootException("数据为空");
|
|
|
+
|
|
|
+ }
|
|
|
select.setSaveData(saveRunFlowPath.getSaveData());
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
select.setFqUser(user.getUsername());
|
|
@@ -137,11 +143,18 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
|
|
|
public void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep) {
|
|
|
|
|
|
ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRunFlowPathStep.getRunFlowPath());
|
|
|
+
|
|
|
+
|
|
|
ItdmRunFlowPathStep select = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
|
|
|
.eq(ItdmRunFlowPathStep::getRunFlowPath, itdmRunFlowPath.getId())
|
|
|
.eq(ItdmRunFlowPathStep::getFlowPathSetp, itdmRunFlowPath.getDqSetp())
|
|
|
|
|
|
);
|
|
|
+ if (StringUtils.isBlank(select.getSaveData())) {
|
|
|
+
|
|
|
+ throw new JeecgBootException("数据为空");
|
|
|
+
|
|
|
+ }
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
select.setFqUser(user.getUsername());
|
|
|
select.setShenheTime(new Date());
|