From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
index c75a0e4..ddec6d4 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
@@ -2,14 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-import com.moral.api.pojo.enums.AllocationApproveEnum;
-import com.moral.api.pojo.enums.AppAllocationStateEnum;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.app.AppAllocationFileCond;
import com.moral.api.pojo.query.app.AppAllocationPageCond;
-import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAuthority;
import com.moral.constant.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -92,4 +89,13 @@
return ResultMessage.ok();
}
+
+ @GetMapping("authority")
+ @ApiOperation(value = "������������")
+ public ResultMessage authority(@RequestParam @ApiParam(value = "allocationNum",name = "������") String allocationNum,
+ @RequestParam @ApiParam(value = "userId",name = "������Id") Integer userId){
+ AppAuthority authority = allocationService.authority(allocationNum, userId);
+ return ResultMessage.ok(authority);
+ }
+
}
--
Gitblit v1.8.0