Browse Source

解决员工日报相关BUG

wukai 4 months ago
parent
commit
018f85f795

+ 6 - 3
jjt-biz/src/main/java/com/jjt/emp/service/impl/TwinEmpServiceImpl.java

@@ -144,17 +144,20 @@ public class TwinEmpServiceImpl implements ITwinEmpService {
         TwinEmp twinEmp = new TwinEmp();
         twinEmp.setEmpDate(date);
         List<TwinEmp> list = selectTwinEmpList(twinEmp);
-        Long empId = list.get(0).getEmpId();
-        twinEmp = selectTwinEmpByEmpId(empId);
+
         if (list.size() == 0) {
             //如果未找到,则取最后一条记录
             list = selectTwinEmpList(new TwinEmp());
-            empId = list.get(0).getEmpId();
+            Long empId = list.get(0).getEmpId();
+
             TwinEmp emp = selectTwinEmpByEmpId(empId);
             emp.setEmpId(null);
             emp.setEmpDate(date);
             insertTwinEmp(emp);
             twinEmp = emp;
+        } else {
+            Long empId = list.get(0).getEmpId();
+            twinEmp = selectTwinEmpByEmpId(empId);
         }
         return twinEmp;
     }