sync: 对齐小程序 v1.0.2 生产代码并脱敏
This commit is contained in:
@@ -38,6 +38,15 @@ func (s *sAppCard) List(ctx context.Context, param *model.AppCardListParam) (ite
|
||||
}
|
||||
|
||||
mod := s.visibleCardModel(ctx, user)
|
||||
if param.AllocateOnly {
|
||||
if s.isTerminalUser(ctx, user) || user.DeptId <= 0 {
|
||||
return nil, 0, gerror.New("当前账号不能划拨卡片")
|
||||
}
|
||||
if err := appEnsureFeatureAccess(ctx, "card:allocate"); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
mod = mod.Where(dao.TSimCardInfo.Table()+"."+dao.TSimCardInfo.Columns().DeptId, user.DeptId)
|
||||
}
|
||||
mod = s.applyCardFilters(mod, param)
|
||||
if param.Page <= 0 {
|
||||
param.Page = 1
|
||||
@@ -328,7 +337,15 @@ func (s *sAppCard) cardQueryBase(ctx context.Context, useAuth bool) *gdb.Model {
|
||||
|
||||
func (s *sAppCard) applyCardFilters(mod *gdb.Model, param *model.AppCardListParam) *gdb.Model {
|
||||
if strings.TrimSpace(param.CardValue) != "" {
|
||||
mod = mod.Where(appCardValueCondition(), appCardValueArgs(param.CardValue)...)
|
||||
if param.AllocateOnly {
|
||||
// 划拨列表支持号码片段检索,详情与执行提交仍按完整号码定位。
|
||||
value := "%" + strings.TrimSpace(param.CardValue) + "%"
|
||||
columns := dao.TSimCardInfo.Columns()
|
||||
table := dao.TSimCardInfo.Table() + "."
|
||||
mod = mod.Where("("+table+columns.Iccid+" LIKE ? OR "+table+columns.Msisdn+" LIKE ? OR "+table+columns.Imsi+" LIKE ? OR "+table+columns.Imei+" LIKE ?)", value, value, value, value)
|
||||
} else {
|
||||
mod = mod.Where(appCardValueCondition(), appCardValueArgs(param.CardValue)...)
|
||||
}
|
||||
}
|
||||
if strings.TrimSpace(param.CategoryCode) != "" {
|
||||
mod = mod.Where(dao.TSimFlowPackageInfo.Table()+"."+dao.TSimFlowPackageInfo.Columns().CategoryCode, strings.TrimSpace(param.CategoryCode))
|
||||
|
||||
Reference in New Issue
Block a user