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

server-module/src/main/java/com/makeit/module/controller/wechat/space/PlatSpaceWechatController.java

@@ -68,7 +68,7 @@ public class PlatSpaceWechatController {
     }
     }
 
 
 
 
-    @ApiOperation("一级空间列表")
+    @ApiOperation("一级空间列表(参数传组织id)")
     @PostMapping("oneLevelList")
     @PostMapping("oneLevelList")
     public ApiResponseEntity<List<PlatSpaceAddDTO>> oneLevelList(@RequestBody BaseIdDTO dto) {
     public ApiResponseEntity<List<PlatSpaceAddDTO>> oneLevelList(@RequestBody BaseIdDTO dto) {
         List<PlatSpaceAddDTO> data = spaceService.oneLevelList(dto);
         List<PlatSpaceAddDTO> data = spaceService.oneLevelList(dto);

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -324,6 +324,11 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_TENANT_NOT_EXIST);
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_TENANT_NOT_EXIST);
             }
             }
 
 
+        }else {
+            PlatTenant platTenant = platTenantService.getById(tntUserLoginVO.getTenantId());
+            PlatTenantVO vo = BeanDtoVoUtils.convert(platTenant, PlatTenantVO.class);
+            //没有值的情况：登陆后无法跳转
+            tntUserLoginVO.setTenantList(Arrays.asList(vo));
         }
         }
     }
     }
 
 

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java

@@ -70,7 +70,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
         check(dto);
         check(dto);
         PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class);
         PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class);
         if(StringUtil.isEmpty(dto.getParentId())){
         if(StringUtil.isEmpty(dto.getParentId())){
-            PlatUserVO userVO = PlatUserUtil.getUserVO();
+            PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
             space.setOrgId(userVO.getOrgId());
             space.setOrgId(userVO.getOrgId());
             PlatOrg org = platOrgService.getById(space.getOrgId());
             PlatOrg org = platOrgService.getById(space.getOrgId());
             if(org!=null){
             if(org!=null){

server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java

@@ -48,6 +48,7 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
     private String dealUser;
     private String dealUser;
 
 
     @ApiModelProperty(value = "处理时间")
     @ApiModelProperty(value = "处理时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime dealDate;
     private LocalDateTime dealDate;
 
 
     @ApiModelProperty(value = "所属组织id")
     @ApiModelProperty(value = "所属组织id")