From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
index 0761c74..0f20a74 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -60,6 +60,9 @@
if (isNotBlank(comPropertyVO.getAccount())) {
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setType(3);
+ if (comPropertyVO.getCommunityId().equals(10172)){
+ administratorsUserVO.setType(20);
+ }
administratorsUserVO.setAccount(comPropertyVO.getAccount());
administratorsUserVO.setPassword(comPropertyVO.getPassword());
administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
@@ -142,4 +145,9 @@
comPropertyVO.setPassword(null);
return R.ok(comPropertyVO);
}
+
+ @Override
+ public R noticeList(Integer page, Integer size, Long propertyId) {
+ return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId));
+ }
}
--
Gitblit v1.7.1