解除冲突

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -115,6 +115,13 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="适配任务记录")
     private LacLogTask logTask;
 
+    public Long getTaskInstanceId(){
+        if(lacSuitTask == null){
+            return logTask.getId();
+        }
+        return null;
+    }
+
     public LacCommandStackStepTask() {
     }
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -61,7 +61,6 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bean.getTaskInstanceId(),"taskInstanceId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);