Эх сурвалжийг харах

编辑修改,不展示当前待办流程步骤

wangliang 1 жил өмнө
parent
commit
eb276404e9

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -861,7 +861,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         }
         for (Map.Entry<String, FlowTaskResult> entry : setupMap.entrySet()) {
             FlowTaskResult flowTaskResult = GsonUtil.fromJson(GsonUtil.toJson(entry.getValue()), FlowTaskResult.class);
-            if (flowTaskResult.getSetup() > 0) {
+            if (flowTaskResult.getSetup().intValue() > 0) {
                 //正在审批的表单
                 if (Objects.nonNull(tfFlowApprove.getSetup()) && flowTaskResult.getSetup().intValue() == tfFlowApprove.getSetup().intValue()) {
                     currFlowTaskResult = flowTaskResult;

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -969,7 +969,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 }
                 if (tfFlowApprove.getSetup().intValue() != 0 && tfFlowApprove.getSetup().intValue() < entry.getValue().getSetup().intValue()) {
                     break;
-                } else {
+                } else if (entry.getValue().getSetup().intValue() != tfFlowApprove.getSetup().intValue()) {
                     setupMapNew.put(entry.getKey(), entry.getValue());
                 }
             }