Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

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

@@ -157,7 +157,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         //单个删除房屋，房屋内有居民不允许删除
         NeighborHoodManageDelFormDTO formDTO=new NeighborHoodManageDelFormDTO();
         formDTO.setType(CustomerGridConstant.HOUSE);
-        formDTO.setIds(Arrays.asList(houseId));
+        List<String> ids=new ArrayList<>();
+        ids.add(houseId);
+        formDTO.setIds(ids);
         allDelete(formDTO);
     }