Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
+2
-2
@@ -5867,12 +5867,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
|||||||
countError++;
|
countError++;
|
||||||
} else {
|
} else {
|
||||||
if (value.split("#").length > 1) {
|
if (value.split("#").length > 1) {
|
||||||
resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut);
|
resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut);
|
||||||
errorMsg += (String) resultMap.get("errorMsg");
|
errorMsg += (String) resultMap.get("errorMsg");
|
||||||
countError += (int) resultMap.get("countError");
|
countError += (int) resultMap.get("countError");
|
||||||
configDataEO.setPullData(value.split("#")[1]);
|
configDataEO.setPullData(value.split("#")[1]);
|
||||||
|
|
||||||
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut);
|
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut);
|
||||||
errorMsg += (String) resultMap.get("errorMsg");
|
errorMsg += (String) resultMap.get("errorMsg");
|
||||||
countError += (int) resultMap.get("countError");
|
countError += (int) resultMap.get("countError");
|
||||||
configDataEO.setTextData(value.split("#")[0]);
|
configDataEO.setTextData(value.split("#")[0]);
|
||||||
|
|||||||
Reference in New Issue
Block a user