Merge branch 'lal' into 'develop'

提交 See merge request 8timerv2/8timerapiv200!423

Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!423
3b51e444 · leialin · e570dcba · 69ce2a6a · 3b51e444
Commit 3b51e444 authored Aug 12, 2020 by leialin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

src/main/java/cn/timer/api/controller/yggl/YgglController.java
+5 -0

No files found.
--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -1844,6 +1844,11 @@ public class YgglController {
 			Collections.reverse(loginerChargeDtos);
+			if(loginerChargeDtos.size()>0) {
+				if((userBean.getEmpNum()).equals(loginerChargeDtos.get(loginerChargeDtos.size()-1).getLeaderEmpNum())) {
+					loginerChargeDtos.remove(loginerChargeDtos.size()-1);
+				}
+			}
 			return ResultUtil.data(loginerChargeDtos);
 		}
 		return ResultUtil.data(loginerChargeDtos);