From 177c3c29e953c8b30e71d049f0df4cd3d6f17e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 4 Jan 2021 15:20:43 +0800
Subject: [PATCH] commit

---
 .../BaseRoleMenuDao/BaseRoleMenuDao.go        | 19 +++++++++++++++++++
 .../BaseRoleMenuService.go                    | 14 ++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuDao/BaseRoleMenuDao.go b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuDao/BaseRoleMenuDao.go
index e39d5f22..24ea33f7 100644
--- a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuDao/BaseRoleMenuDao.go
+++ b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuDao/BaseRoleMenuDao.go
@@ -1,8 +1,11 @@
 package BaseRoleMenuDao
 
 import (
+	"dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuProto"
 	"dsBaseRpc/Utils/DbUtil"
+	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
+	"github.com/xormplus/builder"
 )
 
 var db = DbUtil.Engine
@@ -10,3 +13,19 @@ var db = DbUtil.Engine
 func SetBaseRoleMenuCorr(ms []models.TBaseRoleMenu) (int64, error) {
 	return db.Insert(ms)
 }
+
+//分页查询
+func GetBaseRoleMenuCorr(in *BaseRoleMenuProto.GetCorrArg) ([]map[string]interface{}, int32, error) {
+	//接收传入参数
+	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*").From("t_base_role_menu as t1")
+	myBuilder.And(builder.Eq{"t1.role_id": in.RoleId})
+	myBuilder.And(builder.Eq{"t1.b_use": 1})
+	//获取拼接完成的SQL语句
+	sql, err := myBuilder.ToBoundSQL()
+	if err != nil {
+		return nil, 0, err
+	}
+	//调用多查询字段通用方法
+	list, count, err := SqlKit.Query(sql)
+	return list, count, err
+}
diff --git a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go
index 33c0716d..86e76551 100644
--- a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go
+++ b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go
@@ -22,10 +22,20 @@ func (s *Rpc) GetBaseRoleMenuCorr(ctx context.Context, in *BaseRoleMenuProto.Get
 			fmt.Printf("%s\n", err)
 		}
 	}()
-
-	//in.RoleId--->哪些菜单？
 	//rpc响应
 	var reply BaseRoleMenuProto.Reply
+	list, count, err := BaseRoleMenuDao.GetBaseRoleMenuCorr(in)
+	//错误处理
+	if err != nil {
+		reply.Success = false
+		reply.Message = Const.DataBaseActionError
+		LogUtil.Error(ErrorConst.SqlQueryError, "执行GetBaseRoleMenuCorr时发生严重错误："+err.Error())
+		return &reply, err
+	}
+	reply.Count = count
+	reply.Success = true
+	reply.Message = Const.SuccessDataBaseAction
+	reply.List = CommonUtil.SerializeToString(list)
 	return &reply, nil
 }