|
@@ -62,21 +62,21 @@ public class VerifyUtil {
|
|
|
boolean end = str1.endsWith(")");
|
|
|
|
|
|
if (start == false || end == false) {
|
|
|
- throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "括号格式有误");
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "公式格式有误");
|
|
|
}
|
|
|
String str2 = split[i].substring(split[i].indexOf(")") + 1);
|
|
|
String[] array = { "任一", "任二", "任三", "任四", "任五", "任六", "任七", "任八", "任九", "任十" };
|
|
|
if (str2.length() > 0) {
|
|
|
boolean pp = Arrays.asList(array).contains(str2);
|
|
|
if (pp == false) {
|
|
|
- throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "任几格式有误");
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "公式格式有误");
|
|
|
}
|
|
|
} else {
|
|
|
- throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "找不到任字");
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "公式格式有误");
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "格式有误-拆分出错,请检查公式编码");
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "公式格式有误");
|
|
|
}
|
|
|
|
|
|
return res;
|