lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.activiti.entity.ActivitiDefinition;
import org.jeecg.modules.activiti.mapper.ActivitiDefinitionMapper;
import org.jeecg.modules.activiti.request.ActivitiDefinitionRequest;
@@ -15,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;
@@ -29,6 +32,8 @@
    private DepartmentMapper departmentMapper;
    @Autowired
    private ISysUserService userService;
    @Autowired
    private IMdcProductionService iMdcProductionService;
    @Override
    @Transactional(rollbackFor = {Exception.class})
    public boolean addDefinition(ActivitiDefinition definition) {
@@ -38,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)
        //修改为mdc车间
        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)
@@ -95,7 +101,7 @@
    }
    @Override
    public QueryPageResponseResult<ActivitiDefinition> findPageList(int page, int size, ActivitiDefinitionRequest request) {
    public Result<?> findPageList(int page, int size, ActivitiDefinitionRequest request) {
        if(page < 1 || size < 1) {
            ExceptionCast.cast(CommonCode.INVALID_PAGE);
        }
@@ -105,18 +111,10 @@
            if(ValidateUtil.validateString(request.getActName())) {
                lambdaQuery.like(ActivitiDefinition::getActName, request.getActName());
            }
            if(ValidateUtil.validateString(request.getAscStr())) {
                String[] ascArr = request.getAscStr().split(",");
//                ((Page<ActivitiDefinition>) pageData).setAsc(ascArr);
            }
            if(ValidateUtil.validateString(request.getDescStr())) {
                String[] descStr = request.getDescStr().split(",");
//                ((Page<ActivitiDefinition>) pageData).setDesc(descStr);
            }
        }
        lambdaQuery.orderByDesc(ActivitiDefinition::getCreateTime);
        IPage<ActivitiDefinition> definitionIPage = lambdaQuery.page(pageData);
        return new QueryPageResponseResult<>(CommonCode.SUCCESS, definitionIPage);
        return Result.ok(definitionIPage);
    }