Skip to content

调整分组中name_pinyin的字段名 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 5, 2022
Merged

调整分组中name_pinyin的字段名 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c9a230
Mt ZZerge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jun 15, 2022
f601b5d
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jun 18, 2022
f28a18b
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jun 22, 2022
a473f85
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jun 22, 2022
f6ef5d1
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jul 1, 2022
30c11cf
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jul 3, 2022
d70764c
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jul 4, 2022
69c7aa7
Merge branch 'main' of https://github.com/eryajf/go-ldap-admin
eryajf Jul 4, 2022
e99d334
调整分组name_pinyin的字段名
eryajf Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/client/dingtalk/dingtalk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ func GetAllDepts() (ret []map[string]interface{}, err error) {
for _, dept := range depts.Dept {
ele := make(map[string]interface{})
ele["id"] = dept.Id
ele["name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ele["name"] = dept.Name
ele["parentid"] = dept.ParentId
ele["custom_name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ret = append(ret, ele)
}
return
Expand Down
2 changes: 1 addition & 1 deletion public/client/feishu/feishu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func GetAllDepts() (ret []map[string]interface{}, err error) {
for _, dept := range res.Items {
ele := make(map[string]interface{})
ele["name"] = dept.Name
ele["name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ele["custom_name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ele["parent_department_id"] = dept.ParentDepartmentID
ele["department_id"] = dept.DepartmentID
ele["open_department_id"] = dept.OpenDepartmentID
Expand Down
2 changes: 1 addition & 1 deletion public/client/wechat/wecom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func GetAllDepts() (ret []map[string]interface{}, err error) {
for _, dept := range depts.Department {
ele := make(map[string]interface{})
ele["name"] = dept.Name
ele["name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ele["custom_name_pinyin"] = strings.Join(pinyin.LazyConvert(dept.Name, nil), "")
ele["id"] = dept.ID
ele["name_en"] = dept.NameEn
ele["parentid"] = dept.ParentID
Expand Down