Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java

@@ -42,7 +42,7 @@ public interface PropertyManagementService  {
      * 物业管理批量删除
      * @param id
      */
-    Boolean delete(String id);
+    void delete(String id);
 
     /**
      * 物业管理-列表查询

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java

@@ -182,8 +182,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
+    public void delete(String id) {
-        Boolean delResFlag=true;
         CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
         // 查询当前物业，在本组织及下级范围内，管理的小区
         List<IcNeighborHoodDTO> originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId());
@@ -201,12 +200,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
         LambdaQueryWrapper<IcNeighborHoodPropertyEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id);
         if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) {
-            delResFlag=false;
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除");
         }
         // 删除物业表
         icPropertyManagementDao.deleteById(id);
-        return delResFlag;
     }
 
 
@@ -224,7 +221,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
         }
         List<String> failedIdList = new ArrayList<>();
         for (String id : ids) {
-            Boolean res = delete(id);
+            Boolean res =true;
+            try{
+                //调用单挑删除方法
+                delete(id);
+            }catch(EpmetException e){
+                res=false;
+            }
             if (!res) {
                 failedIdList.add(id);
             }