|
@@ -90,12 +90,22 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
var pars []interface{}
|
|
|
var conditionEnSeller string // 手动禁用的销售
|
|
|
|
|
|
- conditionEnSeller = " AND real_name NOT IN ('余晔', '于卓铭', '张怡', '王芳6') "
|
|
|
+ // 获取图片识别手机号的配置
|
|
|
+ crmConfig, err := company.GetConfigDetailByCode("rai_data_summary_seller")
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取配置失败"
|
|
|
+ br.ErrMsg = "获取配置失败"
|
|
|
+ br.IsSendEmail = false
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //fmt.Println(crmConfig.ConfigValue)
|
|
|
+
|
|
|
+ conditionEnSeller = " AND real_name NOT IN ('余晔', '于卓铭', '张怡', '王芳6') "
|
|
|
mapsellerDevelop := make(map[int]bool) // 开拓组销售Map
|
|
|
mapsellerService := make(map[int]bool) // 服务组销售Map
|
|
|
var sellerIds []string
|
|
|
var sellerServiceIds []string
|
|
|
- condition = " AND role_type_code IN ('rai_seller','rai_group') " + conditionEnSeller
|
|
|
+ condition = " AND role_type_code IN ('rai_seller','rai_group') " + conditionEnSeller + " OR admin_id IN( " + crmConfig.ConfigValue + ") "
|
|
|
|
|
|
sellerListAll, err := system.GetSysUserItemsOrderByCreated(condition, pars)
|
|
|
if err != nil {
|
|
@@ -119,6 +129,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
if adminId != "" {
|
|
|
serviceAdminId = ""
|
|
|
condition += " AND admin_id IN (" + adminId + ") "
|
|
|
+ condition += " OR admin_id IN (" + adminId + ") "
|
|
|
sellerIds = make([]string, 0)
|
|
|
}
|
|
|
if serviceAdminId != "" {
|