BJ_FS / urbanops

Commit 10156008f49c5ca7981dca202dfc7aea29ac7e9f

Authored by wangqian
2 parents 8cd2ca58 90762bff

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 1 changed file with 11 additions and 2 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @1015600
@@ -50,6 +50,7 @@ import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; @@ -50,6 +50,7 @@ import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
50 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; 50 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
51 import com.zteits.urbanops.module.workorder.util.TaskNodeUtils; 51 import com.zteits.urbanops.module.workorder.util.TaskNodeUtils;
52 import jakarta.annotation.Resource; 52 import jakarta.annotation.Resource;
  53 +import jodd.util.StringUtil;
53 import org.flowable.engine.RuntimeService; 54 import org.flowable.engine.RuntimeService;
54 import org.flowable.engine.history.HistoricProcessInstance; 55 import org.flowable.engine.history.HistoricProcessInstance;
55 import org.flowable.engine.runtime.ProcessInstance; 56 import org.flowable.engine.runtime.ProcessInstance;
@@ -140,7 +141,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -140,7 +141,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
140 workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue())); 141 workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue()));
141 workOrder.setCuringLevelName(dictData.getLabel()); 142 workOrder.setCuringLevelName(dictData.getLabel());
142 workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId()); 143 workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
143 - workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); 144 + if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){
  145 + workOrder.setBusiLine(createRequestVo.getBusiLine());
  146 + }else {
  147 + workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
  148 + }
144 workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId()); 149 workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
145 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname()); 150 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
146 LocalDateTime now = LocalDateTime.now(); 151 LocalDateTime now = LocalDateTime.now();
@@ -542,7 +547,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -542,7 +547,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
542 workOrder.setCuringLevelName(dictData.getLabel()); 547 workOrder.setCuringLevelName(dictData.getLabel());
543 workOrder.setCommitDate(LocalDateTime.now()); 548 workOrder.setCommitDate(LocalDateTime.now());
544 workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId()); 549 workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
545 - workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine()); 550 + if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){
  551 + workOrder.setBusiLine(createRequestVo.getBusiLine());
  552 + }else {
  553 + workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
  554 + }
546 workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId()); 555 workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
547 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname()); 556 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
548 //workOrder.setFinishDate(LocalDateTime.now()); 557 //workOrder.setFinishDate(LocalDateTime.now());