From 438b6be5ea9ed484b50a45a0f210b80180473491 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 11:51:45 +0800
Subject: [PATCH] dnc与mdc部门进行整合 使用Mdc部门进行处理 修改所属部门为所属车间 修改yml文件数据库地址
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
index 34bc76c..b2b524d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
@@ -16,7 +16,9 @@
import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,6 +32,8 @@
private DepartmentMapper departmentMapper;
@Autowired
private ISysUserService userService;
+ @Autowired
+ private IMdcProductionService iMdcProductionService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addDefinition(ActivitiDefinition definition) {
@@ -39,8 +43,9 @@
ActivitiDefinition en = getByDepartId(definition.getDepartId());
if(en != null)
ExceptionCast.cast(ActivitiDefinitionCode.DEF_IS_EXIST);
- Department department = departmentMapper.selectById(definition.getDepartId());
- if(department == null)
+ //淇敼涓簃dc杞﹂棿
+ MdcProduction mdcProduction=iMdcProductionService.getById(definition.getDepartId());
+ if(mdcProduction == null)
ExceptionCast.cast(ActivitiDefinitionCode.DEF_DEPART_NONE);
String[] userIds = definition.getApproveUsers().split(",");
if(userIds == null|| userIds.length < 1)
--
Gitblit v1.9.3