From 4326a193131dba3514241ee64401ed3f4a2f427d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jan 2024 17:08:09 +0800
Subject: [PATCH] 合同管理校验
---
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 12 ++++++------
src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java | 2 +-
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 9 ++++++++-
src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java | 2 +-
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index b25ec07..aa068a7 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -82,12 +82,12 @@
*/
@Override
public Object getDistrictTree(DistrictVO district) {
- // String userRole = AuthUtil.getUserRole();
- // if (userRole.equals("wygly")) {
- // IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
- // List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- // district.setDistrictIdList(strings);
- // }
+ String userRole = AuthUtil.getUserRole();
+ if (userRole.equals("wygly")||userRole.equals("wyxmjl")) {
+ // 查询管理的小区 不好过滤小区
+ // todo
+ // district.setDistrictIdList(strings);
+ }
Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
stringNodeTree.forEach(node -> recursion(node));
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
index b5f3191..bbbb242 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
@@ -118,7 +118,7 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public R saveOrUpdate(@Valid @RequestBody PropertyCompanyDistrictEntity propertyCompanyDistrict) {
+ public R saveOrUpdate(@Valid @RequestBody PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
return R.status(propertyCompanyDistrictService.saveOrUpdatePropertyCompanyDistrict(propertyCompanyDistrict));
}
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
index b5ca1f4..c5132f1 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
@@ -48,7 +48,7 @@
* @param propertyCompanyDistrict
* @return
*/
- boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict);
+ boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception;
List<UserEntity> getDistictUserByCode(String houseCode);
}
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
index c61228f..e64eb61 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -55,7 +55,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) {
+ public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
IUserService bean = SpringUtil.getBean(IUserService.class);
User user = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, propertyCompanyDistrict.getPrincipal()));
if (StringUtils.isNotBlank(user.getRoleId())) {
@@ -69,6 +69,13 @@
bean.updateById(user);
return updateById(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
} else {
+ long count = count(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getDistrictId, propertyCompanyDistrict.getDistrictId())
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, propertyCompanyDistrict.getPropertyCompanyId())
+ .eq(PropertyCompanyDistrictEntity::getIsDeleted, 0));
+ if (count > 0) {
+ throw new Exception("您已有该小区的合同，请勿重复添加！");
+ }
bean.updateById(user);
return save(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
}
--
Gitblit v1.9.3