Merge branch 'feature/eta2.3.4_business_user' into debug

controllers/chart_classify.go

@@ -983,7 +983,7 @@ func (this *ChartClassifyController) ModifyChartClassify() {
 				}
 				classifyIdSlice = append(classifyIdSlice, tmp)
 			}
-			condition += "  AND chart_classify_id in (" + utils.GetOrmInReplace(len(classifyIdSlice)) + ") "
+			condition += "  AND chart_classify_id not in (" + utils.GetOrmInReplace(len(classifyIdSlice)) + ") "
 			pars = append(pars, classifyIdSlice)
 		}
 
@@ -1006,7 +1006,7 @@ func (this *ChartClassifyController) ModifyChartClassify() {
 			pars = append(pars, adminIdsSlice)
 		}
 		if chartName != "" {
-			condition = " AND chart_name LIKE ? "
+			condition += " AND chart_name LIKE ? "
 			pars = append(pars, utils.GetLikeKeyword(chartName))
 		}
 		allChartInfo, err := models.GetChartInfoItemsByCondition(condition, pars)

controllers/eta_business/user.go

@@ -132,7 +132,7 @@ func (this *EtaBusinessUserController) List() {
 	}
 	// 查找商户信息
 	businessCodeStr := make([]string, 0)
-	businessCodeMap := make(map[string]string)
+	businessCodeMap := make(map[string]*eta_business.EtaBusiness)
 	for _, v := range list {
 		if _, ok := businessCodeMap[v.BusinessCode]; ok {
 			continue
@@ -150,13 +150,15 @@ func (this *EtaBusinessUserController) List() {
 		return
 	}
 	for _, v := range businessList {
-		businessCodeMap[v.BusinessCode] = v.BusinessName
+		businessCodeMap[v.BusinessCode] = v
 	}
 
 	for _, v := range list {
 		tmp := new(models.BusinessUser)
-		if businessName, ok := businessCodeMap[v.BusinessCode]; ok {
-			tmp.BusinessName = businessName
+		if businessInfo, ok := businessCodeMap[v.BusinessCode]; ok {
+			tmp.BusinessName = businessInfo.BusinessName
+			tmp.BusinessSellerId = businessInfo.SellerId
+			tmp.BusinessSellerName = businessInfo.SellerName
 		}
 		tmp.BusinessCode = v.BusinessCode
 		tmp.EtaBusinessId = v.EtaBusinessId
@@ -173,7 +175,6 @@ func (this *EtaBusinessUserController) List() {
 		if !v.LastLoginTime.IsZero() {
 			tmp.LastLoginTime = v.LastLoginTime.Format(utils.FormatDateTime)
 		}
-
 		tmp.CreatedTime = v.CreatedTime.Format(utils.FormatDateTime)
 		tmp.LastUpdatedTime = v.LastUpdatedTime.Format(utils.FormatDateTime)
 		userList = append(userList, tmp)
@@ -303,7 +304,9 @@ func (this *EtaBusinessUserController) AddUser() {
 	user.DepartmentName = req.DepartmentName
 	user.CreatedTime = time.Now()
 	user.RegisterTime = time.Now()
-
+	user.LastUpdatedTime = time.Now()
+	user.SellerId = sysUser.AdminId
+	user.SellerName = sysUser.RealName
 	newId, err := models.AddUser(user)
 	user.UserId = int(newId)
 	if err != nil {
@@ -1122,6 +1125,8 @@ func (this *EtaBusinessUserController) Import() {
 			userData.CreatedTime = time.Now()
 			userData.LastUpdatedTime = time.Now()
 			userData.Enabled = 1
+			userData.SellerId = sysUser.AdminId
+			userData.SellerName = sysUser.RealName
 			//判断该手机号、邮箱是否已经添加，如果已经添加，那么就不再添加
 			var key string
 			key = "user:mobile:" + userData.Mobile

models/chart_collect/stat.go

@@ -65,7 +65,7 @@ func (u *UserCollectChartStat) GetGroupUserPageListByCondition(condition string,
 	if order != "" {
 		tmpSql += ` ORDER BY ` + order + ", user_chart_stat_id DESC"
 	} else {
-		tmpSql += ` ORDER BY user_chart_stat_id DESC`
+		tmpSql += ` ORDER BY collect_num desc, user_chart_stat_id DESC`
 	}
 	tmpSql += ` Limit ?,?`
 	_, err = o.Raw(tmpSql, pars, startSize, pageSize).QueryRows(&items)

models/user.go

@@ -27,6 +27,8 @@ type User struct {
 	PositionStatus       int    `description:"在职状态：1:在职，0:离职"`
 	CreatedTime          time.Time
 	LastUpdatedTime      time.Time `description:"最近一次更新时间"`
+	SellerId             int       `description:"销售ID"`
+	SellerName           string    `description:"销售名称"`
 }
 
 // 用户详情出参
@@ -108,7 +110,7 @@ func GetUserPageListByCondition(condition string, pars []interface{}, order stri
 	if order != "" {
 		tmpSql += ` ORDER BY ` + order + ", user_id DESC"
 	} else {
-		tmpSql += ` ORDER BY user_id DESC`
+		tmpSql += ` ORDER BY  last_updated_time desc, user_id DESC`
 	}
 	tmpSql += ` Limit ?,?`
 	_, err = o.Raw(tmpSql, pars, startSize, pageSize).QueryRows(&items)
@@ -116,22 +118,24 @@ func GetUserPageListByCondition(condition string, pars []interface{}, order stri
 }
 
 type BusinessUser struct {
-	UserId          int
-	BusinessCode    string
-	EtaBusinessId   int
-	BusinessName    string
-	UserName        string `description:"用户名"`
-	RealName        string `description:"姓名"`
-	Mobile          string
-	Email           string
-	CountryCode     string `description:"区号，86、852、886等"`
-	LastLoginTime   string
-	Enabled         int
-	DepartmentName  string `description:"部门名称"`
-	Position        string `description:"岗位"`
-	PositionStatus  int    `description:"在职状态：1:在职，0:离职"`
-	CreatedTime     string
-	LastUpdatedTime string `description:"最近一次更新时间"`
+	UserId             int
+	BusinessCode       string
+	EtaBusinessId      int
+	BusinessName       string
+	UserName           string `description:"用户名"`
+	RealName           string `description:"姓名"`
+	Mobile             string
+	Email              string
+	CountryCode        string `description:"区号，86、852、886等"`
+	LastLoginTime      string
+	Enabled            int
+	DepartmentName     string `description:"部门名称"`
+	Position           string `description:"岗位"`
+	PositionStatus     int    `description:"在职状态：1:在职，0:离职"`
+	CreatedTime        string
+	LastUpdatedTime    string `description:"最近一次更新时间"`
+	BusinessSellerId   int    `description:"销售ID"`
+	BusinessSellerName string `description:"销售名称"`
 }
 
 type UserListResp struct {