假勤信息优化修改

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

@@ -21,7 +21,6 @@ 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;
 
@@ -170,21 +169,20 @@ public class TBusLeaveController {
           }
           int i = 1;
           List<TBusLeave> updateLsit = new ArrayList<>();
-		  Map<String,String> map = new HashMap<>();
+		  List<String> teleList = new ArrayList<>();
           for (TBusLeave tBusLeave : leaveList) {
                i++;
-			   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() + "'工号员工已离职，请核实无误后再操作！"));
+			   if (Common.isNotNull(tBusLeave.getTeleNo())) {
+				   if (!teleList.isEmpty() && teleList.contains(tBusLeave.getTeleNo())) {
+					   errorList.add(new ErrorMessage(i, "表中已存在对应电信工号'" + tBusLeave.getTeleNo() + "'的离职数据！"));
 					   continue;
 				   } else {
-					   map.put(tBusLeave.getTeleNo(), tBusLeave.getName());
-				   }
-			   }
-			  if (Common.isEmpty(tBusLeave.getTeleNo())) {
+					   teleList.add(tBusLeave.getTeleNo());				   }
+			   } else {
 				  errorList.add(new ErrorMessage(i, "'" + "'电信工号不可为空！"));
-			  } else if (Common.isEmpty(tBusLeave.getLeaveDate()) || Common.isEmpty(tBusLeave.getLeavePostDate())
+				  continue;
+			  }
+			  if (Common.isEmpty(tBusLeave.getLeaveDate()) || Common.isEmpty(tBusLeave.getLeavePostDate())
                        || Common.isEmpty(tBusLeave.getLeaveReason()) || tBusLeave.getLeaveReason().length() > 200) {
                     // 判断并拦截
                     this.judgeLeave(errorList, i, tBusLeave);
@@ -193,9 +191,6 @@ public class TBusLeaveController {
                     this.saveAndJudge(user, nows, errorList, empMap, i, updateLsit, tBusLeave);
                }
           }
-		  if (!map.isEmpty()) {
-			  map.clear();
-		  }
           // 更新人员信息
           this.batchUpdateEmpInfo(updateLsit);
           return R.ok(errorList,"操作成功");