update

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()

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,
 	})
 }
 

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),
 	})
 }