diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index 3f043d6..6f5e656 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -50,6 +50,7 @@ import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.util.TaskNodeUtils; import jakarta.annotation.Resource; +import jodd.util.StringUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ProcessInstance; @@ -140,7 +141,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue())); workOrder.setCuringLevelName(dictData.getLabel()); workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId()); - workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); + if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){ + workOrder.setBusiLine(createRequestVo.getBusiLine()); + }else { + workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); + } workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId()); workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname()); LocalDateTime now = LocalDateTime.now(); @@ -542,7 +547,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ workOrder.setCuringLevelName(dictData.getLabel()); workOrder.setCommitDate(LocalDateTime.now()); workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId()); - workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); + if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){ + workOrder.setBusiLine(createRequestVo.getBusiLine()); + }else { + workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); + } workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId()); workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname()); //workOrder.setFinishDate(LocalDateTime.now());