From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
index 01fe44f..1f0eb33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
@@ -221,9 +221,14 @@
}
String roleFloor = comMngStructAreaDO.getRoleFloor();
String roleDoor = comMngStructAreaDO.getRoleDoor();
+ String areaCode = comMngStructAreaDO.getAreaCode();
if (ObjectUtils.isEmpty(roleDoor)||ObjectUtils.isEmpty(roleFloor)) {
return R.fail("小区未批量设置房屋，请先去社区后台配置");
}
+ Integer num=comMngStructAreaDAO.selectCountHouseByParentHouseCode(areaCode);
+ if (num.intValue()==0) {
+ return R.fail("小区未批量设置房屋，请先去社区后台配置");
+ }
ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
BeanUtils.copyProperties(comMngStructAreaDO,comMngStructAreaVO);
return R.ok(comMngStructAreaVO);
--
Gitblit v1.7.1