修复searchContext in查询

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/filter/%DE%SearchContext.java.ftl

@@ -78,26 +78,13 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
 				this.getSearchCond().isNull("${formitem.getPSDEField().getName()?lower_case}");
 			}
                     <#elseif formitem.getValueOp() == "IN">
-                    <#assign valueSeparator=";">
-                        <#if formitem.getPSCodeListId()??>
-                            <#assign codelistId=formitem.getPSCodeListId()>
-                            <#if sys.getPSCodeList(codelistId,true)??>
-                                <#assign codelist=sys.getPSCodeList(codelistId)>
-                                <#if codelist.getValueSeparator?? && codelist.getValueSeparator()?? && codelist.getValueSeparator()!=''>
-                                    <#assign valueSeparator=codelist.getValueSeparator()>
-                                </#if>
-                            </#if>
-                        </#if>
+                        <#comment>获取分隔符</#comment>
+                        <#assign valueSeparator=getInCondSeparator(formitem)>
 			this.getSearchCond().in("${formitem.getPSDEField().getName()?lower_case}",this.${formitem.getName()?lower_case}.split("${valueSeparator}"));
                     <#elseif formitem.getValueOp() == "NOTIN">
-                        <#if formitem.getPSCodeListId()??>
-                            <#assign codeListName=getCodeListName(formitem.getPSCodeListId())>
-            String defaultSeparator=(CodeListBase.getCodeList("${codeListName}")==null)?";":CodeListBase.getCodeList("${codeListName}").getCodeList().getValueseparator();
-                        <#else >
-            String defaultSeparator=";";
-                        </#if>
-            String defaultSeparator=";";
-			this.getSearchCond().notIn("${formitem.getPSDEField().getName()?lower_case}",this.${formitem.getName()?lower_case}.split(defaultSeparator));
+                        <#comment>获取分隔符</#comment>
+                        <#assign valueSeparator=getInCondSeparator(formitem)>
+			this.getSearchCond().notIn("${formitem.getPSDEField().getName()?lower_case}",this.${formitem.getName()?lower_case}.split("${valueSeparator}"));
                     </#if>
         }
     }
@@ -198,22 +185,13 @@ public class ${item.codeName}SearchContext extends QueryBuildContext {
 				this.getSearchCond().and("${formitem.getPSDEField().getName()?lower_case}").exists(null);
 			}
                     <#elseif formitem.getValueOp() == "IN">
-                        <#if formitem.getPSCodeListId()??>
-                            <#assign codeListName=getCodeListName(formitem.getPSCodeListId())>
-            String defaultSeparator=(CodeListBase.getCodeList("${codeListName}")==null)?";":CodeListBase.getCodeList("${codeListName}").getCodeList().getValueseparator();
-                        <#else >
-            String defaultSeparator=";";
-                        </#if>
-			this.getSearchCond().and("${formitem.getPSDEField().getName()?lower_case}").in(this.${formitem.getName()?lower_case}.split(defaultSeparator)));
+                        <#comment>获取分隔符</#comment>
+                        <#assign valueSeparator=getInCondSeparator(formitem)>
+			this.getSearchCond().and("${formitem.getPSDEField().getName()?lower_case}").in(this.${formitem.getName()?lower_case}.split("${valueSeparator}")));
                     <#elseif formitem.getValueOp() == "NOTIN">
-                        <#if formitem.getPSCodeListId()??>
-                            <#assign codeListName=getCodeListName(formitem.getPSCodeListId())>
-            String defaultSeparator=(CodeListBase.getCodeList("${codeListName}")==null)?";":CodeListBase.getCodeList("${codeListName}").getCodeList().getValueseparator();
-                        <#else >
-            String defaultSeparator=";";
-                        </#if>
-            String defaultSeparator=";";
-			this.getSearchCond().and("${formitem.getPSDEField().getName()?lower_case}").notIn(this.${formitem.getName()?lower_case}.split(defaultSeparator)));
+                        <#comment>获取分隔符</#comment>
+                        <#assign valueSeparator=getInCondSeparator(formitem)>
+			this.getSearchCond().and("${formitem.getPSDEField().getName()?lower_case}").notIn(this.${formitem.getName()?lower_case}.split("${valueSeparator}")));
                     </#if>
         }
     }
@@ -306,4 +284,19 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
 </#if>
 
 
+<#comment>获取in查询的分隔符</#comment>
+<#function getInCondSeparator formitem>
+    <#assign valueSeparator=";">
+    <#if formitem.getPSCodeListId()??>
+        <#assign codelistId=formitem.getPSCodeListId()>
+        <#if sys.getPSCodeList(codelistId,true)??>
+            <#assign codelist=sys.getPSCodeList(codelistId)>
+            <#if codelist.getValueSeparator?? && codelist.getValueSeparator()?? && codelist.getValueSeparator()!=''>
+                <#assign valueSeparator=codelist.getValueSeparator()>
+            </#if>
+        </#if>
+    </#if>
+    <#return valueSeparator/>
+</#function>
+