From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java
index 8394193..d090eb0 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java
@@ -27,12 +27,12 @@
     @PostMapping("/queryProtocol")
     @ApiOperation(value = "获取各种协议", tags = {"用户—登录注册"})
     @ApiImplicitParams({
-            @ApiImplicitParam(value = "类型(1=用户协议,2=隐私协议,3=运动安全公告书)", name = "type", dataType = "int", required = true)
+            @ApiImplicitParam(value = "类型(1=用户协议,2=隐私协议,3=运动安全公告书,4=注销协议)", name = "type", dataType = "int", required = true)
     })
-    public ResultUtil<String> queryProtocol(@RequestBody Integer type){
+    public ResultUtil<String> queryProtocol(Integer type){
         try {
             Protocol protocol = protocolService.getBaseMapper().selectOne(new QueryWrapper<Protocol>().eq("type", type));
-            return ResultUtil.success(protocol.getContent());
+            return ResultUtil.success(null == protocol ? "" : protocol.getContent());
         }catch (Exception e){
             e.printStackTrace();
             return ResultUtil.runErr();
@@ -42,4 +42,6 @@
 
 
 
+
+
 }

--
Gitblit v1.7.1