sop列表修改

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

@@ -355,7 +355,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                             conditionJoin.add(f.getFieldId()).add(f.getOperator().getCode()).add("'").add(f.getFieldValue()).add("'");
                         }
                         if (y < formWidgetMetadataParamList.size() - 1) {
-                            conditionJoin.add(" or ");
+                            conditionJoin.add(SystemConstant.OR);
                         }
                     }
                     conditionJoin.add(" ) ");

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -100,6 +100,7 @@ public class SystemConstant {
     public static final String LIST_JOIN_SPLIT = ",";
     public static final String JOB_DATA = "jobData";
     public static final String AND = " and ";
+    public static final String OR = " or ";
     //    public static final String APPROVE_MAP_VAR = "approve_map_var";
 //    public static final String APPROVE_AUTO = "auto";
     public static final String SYSTEM_AUTO_APPROVE = "系统自动审批";