From e4ae9d0c5b84ff1ceb370269227c55a349d01d3b Mon Sep 17 00:00:00 2001
From: jay <75509151@qq.com>
Date: Tue, 13 Jun 2023 19:18:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/iotkit/data/service/SysConfigDataImpl.java    | 7 +++++--
 .../java/cc/iotkit/data/service/SysLogininfoDataImpl.java | 2 +-
 .../iotkit/system/controller/SysOssConfigController.java  | 8 +++-----
 .../main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java
index d055db89..c1070fab 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java
@@ -104,9 +104,12 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
     @Override
     public SysConfig findOneByCondition(SysConfig data) {
         Predicate predicate = PredicateBuilder.instance()
-                .and(StringUtils.isNotEmpty(data.getConfigKey()), () -> tbSysConfig.configKey.eq(data.getConfigKey()))
+                .and(StringUtils.isNotBlank(data.getConfigKey()), () -> tbSysConfig.configKey.eq(data.getConfigKey()))
                 .build();
-        TbSysConfig tbSysConfig = baseRepository.findOne(predicate).orElseThrow(() -> new BizException(ErrCode.DATA_NOT_EXIST));
+        TbSysConfig tbSysConfig = baseRepository.findOne(predicate).orElse(null);
+        if(Objects.isNull(tbSysConfig)){
+            return null;
+        }
         return MapstructUtils.convert(tbSysConfig, SysConfig.class);
     }
 
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java
index 529d949f..cb9a0149 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java
@@ -55,7 +55,7 @@ public class SysLogininfoDataImpl implements ISysLogininforData, IJPACommData<Sy
 
     @Override
     public Paging<SysLogininfor> findAll(PageRequest<SysLogininfor> pageRequest) {
-        return PageBuilder.toPaging(logininfoRepository.findAll(genPredicate(pageRequest.getData()), PageBuilder.toPageable(pageRequest)));
+        return PageBuilder.toPaging(logininfoRepository.findAll(genPredicate(pageRequest.getData()), PageBuilder.toPageable(pageRequest))).to(SysLogininfor.class);
     }
 
     @Override
diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java
index 695e00f3..8e4f2476 100644
--- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java
+++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java
@@ -50,14 +50,12 @@ public class SysOssConfigController extends BaseController {
     /**
      * 获取对象存储配置详细信息
      *
-     * @param ossConfigId OSS配置ID
      */
     @ApiOperation(value = "获取对象存储配置详细信息", notes = "获取对象存储配置详细信息")
     @SaCheckPermission("system:oss:query")
-    @PostMapping("/{ossConfigId}")
-    public SysOssConfigVo getInfo(@NotNull(message = "主键不能为空")
-                                  @PathVariable Long ossConfigId) {
-        return ossConfigService.queryById(ossConfigId);
+    @PostMapping("/getDetail")
+    public SysOssConfigVo getInfo(@Validated @RequestBody Request<Long> bo) {
+        return ossConfigService.queryById(bo.getData());
     }
 
     /**
diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java
index b4fa1a73..dde0fb75 100644
--- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java
+++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java
@@ -28,7 +28,7 @@ public class SysOssConfigBo extends BaseDto {
      * 主建
      */
     @NotNull(message = "主建不能为空", groups = {EditGroup.class})
-    private Long ossConfigId;
+    private Long id;
 
     /**
      * 配置key