From 3e85aea326fdb353936fe5d8cf1537a8efc718d2 Mon Sep 17 00:00:00 2001 From: wubin Date: Tue, 5 Jan 2021 11:42:45 +0800 Subject: [PATCH] update --- dsBaseRpc/RpcService/BaseRole/BaseRoleDao/BaseRoleDao.go | 2 +- .../BaseMenu/BaseMenuController/BaseMenuController.go | 1 - .../BaseRole/BaseRoleController/BaseRoleController.go | 7 +++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseRole/BaseRoleDao/BaseRoleDao.go b/dsBaseRpc/RpcService/BaseRole/BaseRoleDao/BaseRoleDao.go index a41ed470..77a1bcb4 100644 --- a/dsBaseRpc/RpcService/BaseRole/BaseRoleDao/BaseRoleDao.go +++ b/dsBaseRpc/RpcService/BaseRole/BaseRoleDao/BaseRoleDao.go @@ -85,7 +85,7 @@ func DeleteRoleAppRepleation(roleId string) { func GetRoleAppRepleation(roleId string) ([]map[string]interface{}, error) { var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*,t2.app_name").From("t_base_role_app as t1") myBuilder.InnerJoin("t_app_base as t2", "t1.app_id=t2.app_id") - myBuilder.And(builder.Eq{"t1.app_id": roleId}) + myBuilder.And(builder.Eq{"t1.role_id": roleId}) myBuilder.And(builder.Eq{"t1.b_use": 1}) //获取拼接完成的SQL语句 sql, err := myBuilder.ToBoundSQL() diff --git a/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go b/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go index 2864c039..bbc6428a 100644 --- a/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go +++ b/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go @@ -84,7 +84,6 @@ func GetMenuInfo(c *gin.Context) { Success: r.Success, Message: r.Message, List: CommonUtil.ConvertJsonStringToMapArray(r.List), - Count: r.Count, }) } diff --git a/dsBaseWeb/Business/BaseRole/BaseRoleController/BaseRoleController.go b/dsBaseWeb/Business/BaseRole/BaseRoleController/BaseRoleController.go index 1128d7e9..8db3e983 100644 --- a/dsBaseWeb/Business/BaseRole/BaseRoleController/BaseRoleController.go +++ b/dsBaseWeb/Business/BaseRole/BaseRoleController/BaseRoleController.go @@ -53,7 +53,7 @@ func PageRoleInfo(c *gin.Context) { c.JSON(http.StatusOK, Model.Res{ Success: r.Success, Message: r.Message, - List: CommonUtil.ConvertStringArrayToArray(r.List), + List: CommonUtil.ConvertJsonStringToMapArray(r.List), Count: r.Count, }) } @@ -72,7 +72,7 @@ func PageRoleInfo(c *gin.Context) { // @X-Sort [2] func GetRoleInfo(c *gin.Context) { //角色ID - roleId := c.Query("menuId") + roleId := c.Query("roleId") r, err := BaseRoleService.GetBaseRoleInfo(roleId) if err != nil { c.JSON(http.StatusOK, Model.Res{ @@ -84,8 +84,7 @@ func GetRoleInfo(c *gin.Context) { c.JSON(http.StatusOK, Model.Res{ Success: r.Success, Message: r.Message, - List: CommonUtil.ConvertStringArrayToArray(r.List), - Count: r.Count, + List: CommonUtil.ConvertJsonStringToMapArray(r.List), }) }