From 71df74ba6435a7a6d88ebd47da4c24df2a776228 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 14:17:45 +0800
Subject: [PATCH] 实有人口新增模板导入
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
index 3720095..92faf27 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -225,9 +225,9 @@
}catch (ParseException e) {
e.printStackTrace();
}
-// if (comSwRotaDO == null) {
-// return R.fail(rotaDate + "值班表不存在");
-// }
+ if (comSwRotaDO == null) {
+ return R.fail(rotaDate + "值班表不存在");
+ }
List<ComSwRotaPersonVO> rotaPersons = new ArrayList<>();
if (null != comSwRotaDO){
String rotaPerson = comSwRotaDO.getRotaPerson();
@@ -255,9 +255,9 @@
} catch (ParseException e) {
e.printStackTrace();
}
-// if (comSwRotaDO == null) {
-// return R.fail(rotaDate + "值班表不存在");
-// }
+ if (comSwRotaDO == null) {
+ return R.fail(rotaDate + "值班表不存在");
+ }
List<ComSwRotaPersonVO> rotaLeaders = new ArrayList<>();
if (null != comSwRotaDO){
String rotaPerson = comSwRotaDO.getRotaLeader();
--
Gitblit v1.7.1