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

saas-module/src/main/java/com/makeit/controller/plat/PlatMenuController.java

@@ -2,6 +2,7 @@ package com.makeit.controller.plat;
 
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.module.admin.dto.plat.PlatMenuDTOVO;
 import com.makeit.module.admin.dto.plat.PlatMenuDTOVO;
 import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO;
 import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO;
 import com.makeit.service.saas.PlatMenuService;
 import com.makeit.service.saas.PlatMenuService;
@@ -26,6 +27,7 @@ public class PlatMenuController {
     @ApiOperation("树形列表")
     @ApiOperation("树形列表")
     @PostMapping("tree")
     @PostMapping("tree")
     public ApiResponseEntity<List<PlatMenuDTOVO>> treeAuthIgnore(@RequestBody PlatMenuQueryDTO dto){
     public ApiResponseEntity<List<PlatMenuDTOVO>> treeAuthIgnore(@RequestBody PlatMenuQueryDTO dto){
+        dto.setTenantId(TenantIdUtil.getTenantId());
         return ApiResponseUtils.success(platMenuService.tree(dto));
         return ApiResponseUtils.success(platMenuService.tree(dto));
     }
     }
 }
 }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -737,6 +737,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder db = getById(dto.getId());
         PlatElder db = getById(dto.getId());
         BeanUtils.copyProperties(dto, db);
         BeanUtils.copyProperties(dto, db);
 
 
+        fillSpace(db);
+
         db.setCheckInTime(LocalDateTime.now());
         db.setCheckInTime(LocalDateTime.now());
 
 
         updateById(db);
         updateById(db);