diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java index b9ab193688c32f197b441f1ffe05ae64134e8123..e5da19039748afd3fc136c5d5b19813190ff3276 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java @@ -1,7 +1,9 @@ package neatlogic.module.process.api.processtask; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -10,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +@AuthAction(action = PROCESS_BASE.class) @Service @OperationType(type = OperationTypeEnum.UPDATE) public class ProcessTaskCreateApi extends PrivateApiComponentBase { diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java index c6fac17cf6761794735c265df8bb87f93b6b03ea..291730d3fce252445b73279a5ecf1bd9f4b37af2 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java @@ -18,7 +18,7 @@ package neatlogic.module.process.dao.mapper.score; import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.crossover.IChannelTypeCrossoverMapper; +import neatlogic.framework.process.crossover.IScoreTemplateCrossoverMapper; import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; import neatlogic.framework.process.dto.score.ScoreTemplateVo; @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface ScoreTemplateMapper extends IChannelTypeCrossoverMapper { +public interface ScoreTemplateMapper extends IScoreTemplateCrossoverMapper { List searchScoreTemplate(ScoreTemplateVo scoreTemplateVo); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 638f188b7e4924c68466e124b529d8065679d4ae..bb71680b609d6672c502a848507d323793a302bc 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -640,9 +640,6 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } } } - if (operatorProcessUserTypeList.contains(ProcessUserType.OWNER) && operatorProcessUserTypeList.contains(ProcessUserType.REPORTER)) { - operatorProcessUserTypeList.remove(ProcessUserType.REPORTER); - } List operatorProcessUserTypeTextList = new ArrayList<>(operatorProcessUserTypeList.size()); for (ProcessUserType processUserType : operatorProcessUserTypeList) { operatorProcessUserTypeTextList.add(processUserType.getText()); diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java index 566ee66fefbebfb39a571252bc165544a34a6e9e..78c785f34dff3143d0911b754d73f17b7d13fa6b 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +67,9 @@ public class AssignWorkerPolicyHandler implements IWorkerPolicyHandler { processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getOwner(), ProcessUserType.MAJOR.getValue())); }else if(ProcessUserType.REPORTER.getValue().equals(split[1])) { ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(processTaskId); - processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getReporter(), ProcessUserType.MAJOR.getValue())); + if (StringUtils.isNotBlank(processTaskVo.getReporter())) { + processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getReporter(), ProcessUserType.MAJOR.getValue())); + } } }else if(GroupSearch.getValue(split[0]) != null) { processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, split[0], split[1], ProcessUserType.MAJOR.getValue()));