Merge branches 'dev' and 'dev_epidemic_situation' of http://121.42.41.42:7070/r/epmet-cloud into dev_epidemic_situation

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -170,8 +170,13 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * lzh
+     * @param formDTO
+     * @return 单独删除房屋内部调用/gov/org/house/delete
+     */
     @PostMapping("housedel")
-    public Result houseDel(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
+    public Result houseDel(@RequestBody IcHouseFormDTO formDTO){
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.DeleteGroup.class);
         houseService.delHouse(formDTO.getHouseId());

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

@@ -152,8 +152,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delHouse(String houseId) {
-        //删除小区
+        //单个删除房屋，房屋内有居民不允许删除
-        icHouseService.deleteById(houseId);
+        NeighborHoodManageDelFormDTO formDTO=new NeighborHoodManageDelFormDTO();
+        formDTO.setType(CustomerGridConstant.HOUSE);
+        List<String> ids=new ArrayList<>();
+        ids.add(houseId);
+        formDTO.setIds(ids);
+        allDelete(formDTO);
     }
 
     @Override