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

yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TBusLeaveController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -169,9 +170,21 @@ public class TBusLeaveController {
           }
           int i = 1;
           List<TBusLeave> updateLsit = new ArrayList<>();
+		  Map<String,String> map = new HashMap<>();
           for (TBusLeave tBusLeave : leaveList) {
                i++;
-               if (Common.isEmpty(tBusLeave.getLeaveDate()) || Common.isEmpty(tBusLeave.getLeavePostDate())
+			   if (Common.isNotNull(tBusLeave.getTeleNo()) && Common.isNotNull(tBusLeave.getName())) {
+				   if (null != map.get(tBusLeave.getTeleNo()) &&
+						   tBusLeave.getName().equals(map.get(tBusLeave.getTeleNo()))) {
+					   errorList.add(new ErrorMessage(i, "'" + tBusLeave.getTeleNo() + "'工号员工已离职，请核实无误后再操作！"));
+					   continue;
+				   } else {
+					   map.put(tBusLeave.getTeleNo(), tBusLeave.getName());
+				   }
+			   }
+			  if (Common.isEmpty(tBusLeave.getTeleNo())) {
+				  errorList.add(new ErrorMessage(i, "'" + "'电信工号不可为空！"));
+			  } else if (Common.isEmpty(tBusLeave.getLeaveDate()) || Common.isEmpty(tBusLeave.getLeavePostDate())
                        || Common.isEmpty(tBusLeave.getLeaveReason()) || tBusLeave.getLeaveReason().length() > 200) {
                     // 判断并拦截
                     this.judgeLeave(errorList, i, tBusLeave);
@@ -180,6 +193,9 @@ public class TBusLeaveController {
                     this.saveAndJudge(user, nows, errorList, empMap, i, updateLsit, tBusLeave);
                }
           }
+		  if (!map.isEmpty()) {
+			  map.clear();
+		  }
           // 更新人员信息
           this.batchUpdateEmpInfo(updateLsit);
           return R.ok(errorList,"操作成功");
@@ -251,9 +267,6 @@ public class TBusLeaveController {
                     error = "电信工号未匹配到人员附属信息：'" + tBusLeave.getTeleNo() + "'";
                     errorList.add(new ErrorMessage(i, error));
                }
-          } else {
-               error = "电信工号不可为空！";
-               errorList.add(new ErrorMessage(i, error));
           }
      }