|
|
@@ -466,19 +466,21 @@ func GetSysuserRaiList() (items []*AdminItem, err error) {
|
|
|
sql := `SELECT
|
|
|
real_name,
|
|
|
mobile,
|
|
|
+ group_id,
|
|
|
group_name
|
|
|
FROM
|
|
|
admin
|
|
|
WHERE
|
|
|
- role_type_code IN ('rai_group','rai_seller')
|
|
|
- AND group_id NOT IN ( 19, 10, 17 )
|
|
|
+ role_type_code IN ( 'rai_group', 'rai_seller' )
|
|
|
+ AND group_id NOT IN ( 19, 10, 17, 68, 72 )
|
|
|
AND enabled = 1
|
|
|
- OR real_name IN ( '沈涛', '张传星' ) ` // 先写死，看情况要不要改
|
|
|
+ OR real_name IN ( '沈涛', '张传星' )
|
|
|
+ OR ( group_name = '未分组' AND enabled = 1 ) ` // 先写死，看情况要不要改
|
|
|
_, err = o.Raw(sql).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// GetSysuserRaiList 获取除服务组之外的所有权益销售
|
|
|
+// GetSysuserRaiListNoServer 获取除服务组之外的所有权益销售
|
|
|
func GetSysuserRaiListNoServer() (items []*AdminItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM admin WHERE role_type_code IN ('rai_group','rai_seller') AND role_name NOT IN ('权益服务销售','权益服务组长') `
|
|
|
@@ -557,4 +559,4 @@ func UpdateAdminRoleInfoByRoleId(roleId int, roleName string, roleTypeCode strin
|
|
|
sql := `UPDATE admin SET role_name = ?, role_type_code = ? WHERE role_id = ?`
|
|
|
_, err = o.Raw(sql, roleName, roleTypeCode, roleId).Exec()
|
|
|
return
|
|
|
-}
|
|
|
+}
|
