Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-group
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujiebin
hilo-group
Commits
a0131bab
You need to sign in or sign up before continuing.
Commit
a0131bab
authored
Mar 15, 2023
by
chenweijian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
家族
parent
e5cb1360
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
groupPower.go
cv/group_power_cv/groupPower.go
+1
-1
family.go
domain/model/groupPower_m/family.go
+1
-1
group_power.go
route/group_power_r/group_power.go
+9
-9
No files found.
cv/group_power_cv/groupPower.go
View file @
a0131bab
...
...
@@ -684,7 +684,7 @@ type GroupPowerStar struct {
}
type
FamilyMemberDetail
struct
{
user_cv
.
CvUserExtend
User
user_cv
.
CvUserExtend
Role
groupPower_e
.
GroupPowerUserRole
`json:"role"`
}
...
...
domain/model/groupPower_m/family.go
View file @
a0131bab
...
...
@@ -134,7 +134,7 @@ func UpdateFamily(model *domain.Model, familyId uint64, name, nameplate, declara
if
icon
!=
""
{
updateMap
[
"icon"
]
=
icon
}
result
:=
db
.
Updates
(
updateMap
)
.
Limit
(
1
)
result
:=
db
.
Where
(
"id = ?"
,
familyId
)
.
Updates
(
updateMap
)
.
Limit
(
1
)
if
result
.
Error
!=
nil
{
return
myerr
.
WrapErr
(
result
.
Error
)
}
...
...
route/group_power_r/group_power.go
View file @
a0131bab
...
...
@@ -899,7 +899,7 @@ func GroupPowerMembers(c *gin.Context) (*mycontext.MyContext, error) {
for
_
,
v
:=
range
members
{
result
=
append
(
result
,
group_power_cv
.
FamilyMemberDetail
{
CvUserExtend
:
users
[
v
.
UserId
],
User
:
users
[
v
.
UserId
],
Role
:
v
.
Role
,
})
}
...
...
@@ -1343,13 +1343,13 @@ func GroupPowerSetInfo(c *gin.Context) (*mycontext.MyContext, error) {
return
myContext
,
err
}
type
param
struct
{
Id
uint64
`
json
:"id"`
Name
string
`
json
:"name"`
Nameplate
string
`
json
:"nameplate"`
// 铭牌
Declaration
string
`
json
:"declaration"`
// 宣言
Icon
string
`
json
:"icon"`
// 头像
Id
uint64
`
form
:"id"`
Name
string
`
form
:"name"`
Nameplate
string
`
form
:"nameplate"`
// 铭牌
Declaration
string
`
form
:"declaration"`
// 宣言
Icon
string
`
form
:"icon"`
// 头像
}
para
:=
new
(
param
)
var
para
param
if
err
:=
c
.
ShouldBind
(
&
para
);
err
!=
nil
{
return
myContext
,
err
}
...
...
@@ -1392,7 +1392,7 @@ func GroupPowerSetInfo(c *gin.Context) (*mycontext.MyContext, error) {
}
// 修改家族信息
err
=
groupPower_m
.
UpdateFamily
(
model
,
user
Id
,
para
.
Name
,
para
.
Nameplate
,
para
.
Declaration
,
para
.
Icon
)
err
=
groupPower_m
.
UpdateFamily
(
model
,
para
.
Id
,
para
.
Name
,
para
.
Nameplate
,
para
.
Declaration
,
para
.
Icon
)
if
err
!=
nil
{
return
myContext
,
myerr
.
WrapErr
(
err
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment