Browse Source

修改BUG

zhou.xiaoning 4 years ago
parent
commit
807bcdcd10
5 changed files with 8 additions and 42 deletions
  1. 6 24
      controllers/ermcp/qryUser.go
  2. 0 6
      docs/docs.go
  3. 0 6
      docs/swagger.json
  4. 0 4
      docs/swagger.yaml
  5. 2 2
      models/common.go

+ 6 - 24
controllers/ermcp/qryUser.go

@@ -55,7 +55,6 @@ func QueryUserInfo(c *gin.Context) {
 // GetErmcpRolefuncMenuReq 获取企业风管终端权限请求参数
 type GetErmcpRolefuncMenuReq struct {
 	LoginID int `form:"loginID" binding:"required"`
-	Mode    int `form:"mode"`
 }
 
 // GetErmcpRoleFuncMenuLists 获取企业风管终端权限
@@ -63,7 +62,6 @@ type GetErmcpRolefuncMenuReq struct {
 // @Produce json
 // @Security ApiKeyAuth
 // @Param loginID query int true "登录账号"
-// @Param mode query int false "模式,0:普通(交易所版本);1:企业风管"
 // @Success 200 {object} models.Funcmenulist
 // @Failure 500 {object} app.Response
 // @Router /Ermcp/GetErmcpRoleFuncMenuLists [get]
@@ -80,28 +78,12 @@ func GetErmcpRoleFuncMenuLists(c *gin.Context) {
 	}
 
 	// 获取数据
-	rst := make([]models.Funcmenulist, 0)
-	if req.Mode == 0 {
-		// 普通(交易所版本)
-		var err error
-		rst, err = models.GetRoleFuncMenuLists(req.LoginID, "")
-		if err != nil {
-			// 查询失败
-			logger.GetLogger().Errorf("GetErmcpRolefuncMenu failed: %s", err.Error())
-			appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
-			return
-		}
-	} else if req.Mode == 1 {
-		// 企业风管
-		// 普通(交易所版本)
-		var err error
-		rst, err = models.GetErmcpRoleFuncMenuLists(req.LoginID, "")
-		if err != nil {
-			// 查询失败
-			logger.GetLogger().Errorf("GetErmcpRolefuncMenu failed: %s", err.Error())
-			appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
-			return
-		}
+	rst, err := models.GetErmcpRoleFuncMenuLists(req.LoginID, "")
+	if err != nil {
+		// 查询失败
+		logger.GetLogger().Errorf("GetErmcpRolefuncMenu failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		return
 	}
 
 	// 查询成功返回

+ 0 - 6
docs/docs.go

@@ -935,12 +935,6 @@ var doc = `{
                         "name": "loginID",
                         "in": "query",
                         "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "模式,0:普通(交易所版本);1:企业风管",
-                        "name": "mode",
-                        "in": "query"
                     }
                 ],
                 "responses": {

+ 0 - 6
docs/swagger.json

@@ -919,12 +919,6 @@
                         "name": "loginID",
                         "in": "query",
                         "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "模式,0:普通(交易所版本);1:企业风管",
-                        "name": "mode",
-                        "in": "query"
                     }
                 ],
                 "responses": {

+ 0 - 4
docs/swagger.yaml

@@ -11890,10 +11890,6 @@ paths:
         name: loginID
         required: true
         type: integer
-      - description: 模式,0:普通(交易所版本);1:企业风管
-        in: query
-        name: mode
-        type: integer
       produces:
       - application/json
       responses:

+ 2 - 2
models/common.go

@@ -777,7 +777,7 @@ func GetSystemParams() ([]Systemparam, error) {
 	return systemParams, nil
 }
 
-// GetRoleFuncMenuLists 获取终端权限
+// GetRoleFuncMenuLists 获取终端权限(交易所版本)
 func GetRoleFuncMenuLists(loginID int, resourceCode string) ([]Funcmenulist, error) {
 	funcMenuLists := make([]Funcmenulist, 0)
 
@@ -796,7 +796,7 @@ func GetRoleFuncMenuLists(loginID int, resourceCode string) ([]Funcmenulist, err
 	return funcMenuLists, nil
 }
 
-// GetErmcpRoleFuncMenuLists 企业风管专用的终端权限,区分企业和企业成员
+// GetErmcpRoleFuncMenuLists 获取终端权限(企业风管专用,区分企业和企业成员
 func GetErmcpRoleFuncMenuLists(loginID int, resourceCode string) ([]Funcmenulist, error) {
 	funcMenuLists := make([]Funcmenulist, 0)