Commit ae138b04 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

parents d5ebf7bb 6f62ad7a
...@@ -184,7 +184,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -184,7 +184,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
empInfo = entry.getName(); empInfo = entry.getName();
infoList.add(empInfo); infoList.add(empInfo);
String dataType = ""; String dataType = "";
if (empInfo.length() == empInfo.lastIndexOf("/") + 1) { if (empInfo.lastIndexOf("/") != empInfo.indexOf("/")) {
if (!empInfo.contains("-")) { if (!empInfo.contains("-")) {
return R.failed("请使用正确的文件夹命名格式:身份证-员工姓名"); return R.failed("请使用正确的文件夹命名格式:身份证-员工姓名");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment