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
9bc0a948
You need to sign in or sign up before continuing.
Commit
9bc0a948
authored
Mar 15, 2023
by
chenweijian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
家族
parent
fc7d91ea
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
groupPower.go
cv/group_power_cv/groupPower.go
+2
-2
group_power.go
route/group_power_r/group_power.go
+2
-3
No files found.
cv/group_power_cv/groupPower.go
View file @
9bc0a948
...
@@ -690,14 +690,14 @@ type FamilyMemberDetail struct {
...
@@ -690,14 +690,14 @@ type FamilyMemberDetail struct {
type
FamilyApplyList
struct
{
type
FamilyApplyList
struct
{
User
*
user_m
.
UserTiny
`json:"user"`
User
*
user_m
.
UserTiny
`json:"user"`
Time
string
`json:"time"`
Time
int64
`json:"time"`
Status
int8
`json:"status"`
// 0未操作,1已接受,2.已拒绝
Status
int8
`json:"status"`
// 0未操作,1已接受,2.已拒绝
MgrName
string
`json:"mgrName"`
// 管理员名称
MgrName
string
`json:"mgrName"`
// 管理员名称
}
}
type
FamilyQuitList
struct
{
type
FamilyQuitList
struct
{
User
*
user_m
.
UserTiny
`json:"user"`
User
*
user_m
.
UserTiny
`json:"user"`
Time
string
`json:"time"`
Time
int64
`json:"time"`
QuitType
int8
`json:"status"`
// 1.主动退出 2.被踢出
QuitType
int8
`json:"status"`
// 1.主动退出 2.被踢出
MgrName
string
`json:"mgrName"`
// 管理员名称
MgrName
string
`json:"mgrName"`
// 管理员名称
}
}
route/group_power_r/group_power.go
View file @
9bc0a948
...
@@ -14,7 +14,6 @@ import (
...
@@ -14,7 +14,6 @@ import (
"hilo-group/_const/enum/msg_e"
"hilo-group/_const/enum/msg_e"
"hilo-group/_const/redis_key"
"hilo-group/_const/redis_key"
"hilo-group/common"
"hilo-group/common"
"hilo-group/common/utime"
"hilo-group/cv/group_cv"
"hilo-group/cv/group_cv"
"hilo-group/cv/group_power_cv"
"hilo-group/cv/group_power_cv"
"hilo-group/cv/medal_cv"
"hilo-group/cv/medal_cv"
...
@@ -1095,7 +1094,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) {
...
@@ -1095,7 +1094,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) {
result
:=
make
([]
*
group_power_cv
.
FamilyApplyList
,
0
,
len
(
rows
))
result
:=
make
([]
*
group_power_cv
.
FamilyApplyList
,
0
,
len
(
rows
))
for
_
,
v
:=
range
rows
{
for
_
,
v
:=
range
rows
{
info
:=
&
group_power_cv
.
FamilyApplyList
{
User
:
userMap
[
v
.
UserId
],
Time
:
v
.
CreatedTime
.
Format
(
utime
.
LayoutMinute
),
Status
:
v
.
IsAccept
}
info
:=
&
group_power_cv
.
FamilyApplyList
{
User
:
userMap
[
v
.
UserId
],
Time
:
v
.
CreatedTime
.
UnixMilli
(
),
Status
:
v
.
IsAccept
}
if
v
.
MgrId
>
0
{
if
v
.
MgrId
>
0
{
info
.
MgrName
=
userMap
[
v
.
MgrId
]
.
Nick
info
.
MgrName
=
userMap
[
v
.
MgrId
]
.
Nick
}
}
...
@@ -1245,7 +1244,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) {
...
@@ -1245,7 +1244,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) {
result
:=
make
([]
*
group_power_cv
.
FamilyQuitList
,
0
,
len
(
rows
))
result
:=
make
([]
*
group_power_cv
.
FamilyQuitList
,
0
,
len
(
rows
))
for
_
,
v
:=
range
rows
{
for
_
,
v
:=
range
rows
{
item
:=
&
group_power_cv
.
FamilyQuitList
{
User
:
userMap
[
v
.
UserId
],
Time
:
v
.
CreatedTime
.
Format
(
utime
.
LayoutMinute
)}
item
:=
&
group_power_cv
.
FamilyQuitList
{
User
:
userMap
[
v
.
UserId
],
Time
:
v
.
CreatedTime
.
UnixMilli
(
)}
if
v
.
UserId
==
v
.
MgrId
{
if
v
.
UserId
==
v
.
MgrId
{
item
.
QuitType
=
1
// 主动退出
item
.
QuitType
=
1
// 主动退出
}
else
{
}
else
{
...
...
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