1。修复这些接口的bug

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/StorageController.java

@@ -123,7 +123,7 @@ public class StorageController {
      * @return 申请详情
      */
     @GetMapping("/storage/getCapacityAuditDetail")
-    public CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(@RequestParam(value = "id") Long id) {
+    public CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(@RequestParam(value = "id") String id) {
         return storageService.getCapacityAuditDetail(id);
     }
 
@@ -137,7 +137,7 @@ public class StorageController {
      * @return 审核结果
      */
     @GetMapping("/storage/auditCapacityAudit")
-    public CommonResult<String> auditCapacityAudit(@RequestParam(value = "id") Long id,
+    public CommonResult<String> auditCapacityAudit(@RequestParam(value = "id") String id,
                                                    @RequestParam(value = "auditState") Integer auditState,
                                                    @RequestParam(value = "rejectReason", required = false) String rejectReason) {
         return storageService.auditCapacityAudit(id, auditState, rejectReason);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/CapacityAuditInfoMapper.java

@@ -29,7 +29,7 @@ public interface CapacityAuditInfoMapper extends BaseMapper<CapacityAuditInfo> {
      * @param id 申请ID
      * @return 申请详情
      */
-    CapacityAuditInfoVo getCapacityAuditById(@Param("id") Long id);
+    CapacityAuditInfoVo getCapacityAuditById(@Param("id") String id);
 
     /**
      * 查询用户的申请记录列表

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/IStorageService.java

@@ -79,7 +79,7 @@ public interface IStorageService extends IService<StorageBean> {
      * @param id 申请ID
      * @return 申请详情
      */
-    CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(Long id);
+    CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(String id);
 
     /**
      * 审核扩容申请
@@ -89,7 +89,7 @@ public interface IStorageService extends IService<StorageBean> {
      * @param rejectReason 拒绝原因
      * @return 审核结果
      */
-    CommonResult<String> auditCapacityAudit(Long id, Integer auditState, String rejectReason);
+    CommonResult<String> auditCapacityAudit(String id, Integer auditState, String rejectReason);
 
     /**
      * 用户查看自己申请记录列表

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/StorageService.java

@@ -232,17 +232,22 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
     }
 
     @Override
-    public CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(Long id) {
+    public CommonResult<CapacityAuditInfoVo> getCapacityAuditDetail(String id) {
         // 查询审核详情
         CapacityAuditInfoVo capacityAuditInfo = capacityAuditInfoMapper.getCapacityAuditById(id);
         if (capacityAuditInfo != null) {
+            String userId = capacityAuditInfo.getApplicantUserId();
+            List<String> roleNameList = storageMapper.getUserRoleNameListById(userId);
+            if (roleNameList != null && roleNameList.size() > 0) {
+                capacityAuditInfo.setRoles(roleNameList);
+            }
             return CommonResult.data(capacityAuditInfo);
         }
         return null;
     }
 
     @Override
-    public CommonResult<String> auditCapacityAudit(Long id, Integer auditState, String rejectReason) {
+    public CommonResult<String> auditCapacityAudit(String id, Integer auditState, String rejectReason) {
         // 校验申请单
         CapacityAuditInfo capacityAuditInfo = capacityAuditInfoMapper.selectById(id);
         if (capacityAuditInfo == null) {
@@ -258,6 +263,10 @@ public class StorageService extends ServiceImpl<StorageMapper, StorageBean> impl
             storageBean.setTotalStorageSize(capacityAuditInfo.getApplicantAfterCapacity());
             int update = storageMapper.updateById(storageBean);
             if (update > 0) {
+                // 修改审核状态
+                capacityAuditInfo.setAuditTime(new Date());
+                capacityAuditInfo.setAuditUserId(StpLoginUserUtil.getLoginUser().getId());
+                capacityAuditInfoMapper.updateById(capacityAuditInfo);
                 return CommonResult.ok("扩容申请通过，已更新用户存储空间");
             } else {
                 return CommonResult.error("扩容申请通过失败");