切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
604614fe276dfb17f8dc017c2a7551c0852e8f2e
1 个父辈
bb230126
bug 修复
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
12 行增加
和
6 行删除
pkg/infrastructure/dao/pg_business_bonus.go
pkg/infrastructure/repository/pg_admin_permission.go
pkg/infrastructure/repository/pg_business_bonus_repository.go
pkg/infrastructure/repository/pg_order_base_repository.go
pkg/port/beego/controllers/base_controller.go
pkg/infrastructure/dao/pg_business_bonus.go
查看文件 @
604614f
...
...
@@ -56,7 +56,7 @@ func (dao BusinessBonusDao) SearchBusinessBonus(partnerId int64, partnerNameMatc
if
len
(
partnerCondition
)
>
0
{
sql
+=
fmt
.
Sprintf
(
" AND (%s)"
,
strings
.
Join
(
partnerCondition
,
" OR "
))
}
sql
+=
` limit ? OFFSET ? `
sql
+=
`
ORDER BY business_bonus.id DESC
limit ? OFFSET ? `
allParam
=
append
(
allParam
,
limit
,
offset
)
tx
:=
dao
.
transactionContext
.
PgTx
var
(
...
...
pkg/infrastructure/repository/pg_admin_permission.go
查看文件 @
604614f
...
...
@@ -41,6 +41,7 @@ func (reponsitory AdminPermissionRepository) Find(queryOptions domain.Permission
if
len
(
queryOptions
.
Ids
)
>
0
{
query
=
query
.
WhereIn
(
"id in (?) "
,
queryOptions
.
Ids
)
}
query
=
query
.
Order
(
"admin_permission.sort AES"
)
if
err
:=
query
.
Select
();
err
!=
nil
{
return
nil
,
err
}
...
...
pkg/infrastructure/repository/pg_business_bonus_repository.go
查看文件 @
604614f
...
...
@@ -130,7 +130,7 @@ func (repository *BusinessBonusRepository) Find(queryOptions domain.BusinessBonu
}
else
{
query
=
query
.
Limit
(
1000
)
}
query
=
query
.
Order
(
"business_bonus.id DESC"
)
if
cnt
,
err
=
query
.
SelectAndCount
();
err
!=
nil
{
return
0
,
businessBonuss
,
err
}
...
...
pkg/infrastructure/repository/pg_order_base_repository.go
查看文件 @
604614f
...
...
@@ -133,9 +133,12 @@ func (repository OrderBaseRepository) FindOne(qureyOptions domain.OrderBaseFindO
tx
=
repository
.
transactionContext
.
PgDd
)
m
:=
new
(
models
.
OrderBase
)
err
=
tx
.
Model
(
m
)
.
Where
(
"id=?"
,
qureyOptions
.
OrderId
)
.
First
()
query
:=
tx
.
Model
(
m
)
.
Where
(
"id=?"
,
qureyOptions
.
OrderId
)
if
qureyOptions
.
CompanyId
>
0
{
query
=
query
.
Where
(
"company_id=?"
,
qureyOptions
.
CompanyId
)
}
err
=
query
.
First
()
if
err
!=
nil
{
return
nil
,
err
}
...
...
pkg/port/beego/controllers/base_controller.go
查看文件 @
604614f
...
...
@@ -201,6 +201,8 @@ func (controller *BaseController) setUserCompanyId(id int64) {
func
(
controller
*
BaseController
)
GetUserCompany
()
int64
{
idV
:=
controller
.
Ctx
.
Input
.
GetData
(
"token:company_id"
)
uid
,
err
:=
strconv
.
ParseInt
(
fmt
.
Sprint
(
idV
),
10
,
64
)
logs
.
Error
(
err
)
if
err
!=
nil
{
logs
.
Error
(
err
)
}
return
uid
}
...
...
请
注册
或
登录
后发表评论