From ebb81e045306759adad0ff2248d2bcf46aa5338d Mon Sep 17 00:00:00 2001 From: wubin Date: Thu, 2 Jul 2020 09:52:31 +0800 Subject: [PATCH] update --- .../BaseRolePersonController/BaseRolePersonController.go | 1 + .../BaseRolePersonService/BaseRolePersonProtoService.go | 8 ++++++++ dsBaseWeb/main.go | 2 +- dsBigData/Utils/CommonUtil/CommonUtil.go | 8 ++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonController/BaseRolePersonController.go b/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonController/BaseRolePersonController.go index 0452bc0f..5b58f49b 100644 --- a/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonController/BaseRolePersonController.go +++ b/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonController/BaseRolePersonController.go @@ -68,6 +68,7 @@ func GetManageAreaInfo(c *gin.Context) { // @X-InterfaceName ["GetBaseRolePerson"] // @X-RoleLimit ["1","2","3","4","5","6","7"] // @X-TableName ["t_base_role_person"] +// @X-ExtendSwaggerField [{"column_name":"person_name","sample_data":"李老师","column_comment":"登录人名称"}] // @X-RemoveSwaggerField ["id","id_int","identity_id","b_use","last_updated_time","person_id"] // @X-Sort [2] func GetPersonRoleInfo(c *gin.Context) { diff --git a/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonService/BaseRolePersonProtoService.go b/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonService/BaseRolePersonProtoService.go index 3b1608e6..d07c539d 100644 --- a/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonService/BaseRolePersonProtoService.go +++ b/dsBaseWeb/Business/BaseRolePerson/BaseRolePersonService/BaseRolePersonProtoService.go @@ -2,11 +2,19 @@ package BaseRolePersonService import ( "dsBaseWeb/Business/BaseRolePerson/BaseRolePersonProto" + "dsBaseWeb/Business/BaseTeacher/BaseTeacherProto" + "dsBaseWeb/Business/BaseTeacher/BaseTeacherService" + "dsBaseWeb/Utils/CommonUtil" "encoding/json" ) func GetPersonRoleInfo(personId string, actionPersonId string, actionIpAddress string) (*BaseRolePersonProto.Reply, error) { Reply, err := PageBaseRolePerson(BaseRolePersonProto.QueryArg{PersonId: personId, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) + if Reply.List != "[]" { + PersonReply, _ := BaseTeacherService.GetBaseTeacher(BaseTeacherProto.ModelArg{PersonId: personId, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) + handleListStr := CommonUtil.ListMerge(Reply.List, PersonReply.List, "person_id", "person_id", "person_name", "xm") + Reply.List = handleListStr + } return Reply, err } diff --git a/dsBaseWeb/main.go b/dsBaseWeb/main.go index b6f32ca1..947d8707 100644 --- a/dsBaseWeb/main.go +++ b/dsBaseWeb/main.go @@ -57,7 +57,7 @@ func main() { r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) //统一认证拦截器 - //r.Use(Handler.SsoHandler()) + r.Use(Handler.SsoHandler()) //前台页面目录 r.Static("/dsBaseWeb", "./Html") diff --git a/dsBigData/Utils/CommonUtil/CommonUtil.go b/dsBigData/Utils/CommonUtil/CommonUtil.go index 99b9d8ed..53addc53 100644 --- a/dsBigData/Utils/CommonUtil/CommonUtil.go +++ b/dsBigData/Utils/CommonUtil/CommonUtil.go @@ -638,3 +638,11 @@ func ListCollectAttributes(listStr string, attr string) []string { } return orgIdArray } + +func ConvertStringArrToInterfaceArr(arr []string) []interface{} { + interfaceArr := make([]interface{}, 0) + for i := range arr { + interfaceArr = append(interfaceArr, arr[i]) + } + return interfaceArr +}