From 1711ba5011d0c3101d48364d93e10355a5c4fe6d Mon Sep 17 00:00:00 2001
From: tangxuhui <554895468@qq.com>
Date: Fri, 30 Jul 2021 11:42:26 +0800
Subject: [PATCH] 添加下拉列表接口

---
 pkg/application/web/users/service/users.go                | 25 ++++++++++++++-----------
 pkg/port/beego/controllers/web_client/users_controller.go | 10 ++++++++++
 pkg/port/beego/routers/web_users_router.go                |  1 +
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkg/application/web/users/service/users.go b/pkg/application/web/users/service/users.go
index 55f63c2..68f7c16 100644
--- a/pkg/application/web/users/service/users.go
+++ b/pkg/application/web/users/service/users.go
@@ -424,22 +424,25 @@ func (usersService *UsersService) SelectorCompanyRole(selectorQuery *query.Compa
 		selectorQuery.Operator.OrgId,
 		selectorQuery.Operator.UserId)
 	result, err := creationUserGateway.RoleSearch(allied_creation_user.ReqRoleSearch{
-		Limit:  selectorQuery.PageSize,
-		Offset: (selectorQuery.PageNumber - 1) * selectorQuery.PageSize,
+		Limit:    selectorQuery.PageSize,
+		Offset:   (selectorQuery.PageNumber - 1) * selectorQuery.PageSize,
+		RoleName: selectorQuery.RoleName,
 	})
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	var (
-		dataList []dto.UserOrg
-		// item     dto.UserOrg
+		dataList []dto.UserRole
+		item     dto.UserRole
 	)
-	// for _, v := range result.Orgs {
-	// 	item = dto.UserOrg{
-	// 		OrgID:   strconv.Itoa(v.OrgID),
-	// 		OrgName: v.OrgName,
-	// 	}
-	// 	dataList = append(dataList, item)
-	// }
+	for _, v := range result.Roles {
+		item = dto.UserRole{
+			RoleID:   strconv.Itoa(v.RoleID),
+			RoleName: v.RoleName,
+			OrgName:  v.Ext.OrgName,
+			Descript: v.Desc,
+		}
+		dataList = append(dataList, item)
+	}
 	return int64(result.Count), dataList, nil
 }
diff --git a/pkg/port/beego/controllers/web_client/users_controller.go b/pkg/port/beego/controllers/web_client/users_controller.go
index 7fc3fe0..491caba 100644
--- a/pkg/port/beego/controllers/web_client/users_controller.go
+++ b/pkg/port/beego/controllers/web_client/users_controller.go
@@ -129,3 +129,13 @@ func (controller *UsersController) SelectorCompanyOrg() {
 	cnt, data, err := usersService.SelectorCompanyOrg(selectorQuery)
 	controller.returnPageListData(cnt, data, err, selectorQuery.PageNumber)
 }
+
+//SelectorCompanyRole 角色选择表
+func (controller *UsersController) SelectorCompanyRole() {
+	usersService := service.NewUsersService(nil)
+	selectorQuery := &query.CompanyRoleSelectorQuery{}
+	controller.Unmarshal(selectorQuery)
+	selectorQuery.Operator = controller.GetOperator()
+	cnt, data, err := usersService.SelectorCompanyRole(selectorQuery)
+	controller.returnPageListData(cnt, data, err, selectorQuery.PageNumber)
+}
diff --git a/pkg/port/beego/routers/web_users_router.go b/pkg/port/beego/routers/web_users_router.go
index 6026704..27eb01c 100644
--- a/pkg/port/beego/routers/web_users_router.go
+++ b/pkg/port/beego/routers/web_users_router.go
@@ -19,5 +19,6 @@ func init() {
 	web.Router("/v1/web/users/cooperation-user/enable", &web_client.UsersController{}, "Put:CooperationUserEnable")
 	web.Router("/v1/web/users/cooperation-user/reset-password", &web_client.UsersController{}, "Put:CooperationUserResetPassword")
 	web.Router("/v1/web/users/selector/org", &web_client.UsersController{}, "Post:SelectorCompanyOrg")
+	web.Router("/v1/web/users/selector/role", &web_client.UsersController{}, "Post:SelectorCompanyRole")
 
 }
--
libgit2 0.24.0