no message

controllers/company_seller.go

@@ -173,7 +173,7 @@ func (c *CompanySellerController) ActivityFiccList() {
 		utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_DEPARTMENT, utils.ROLE_TYPE_CODE_FICC_GROUP,
 		utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
 	}
-	cond := fmt.Sprintf(` AND role_type_code IN (%s)`, utils.GetOrmInReplace(len(roleArr)))
+	cond := fmt.Sprintf(` AND role_type_code IN (%s)  AND enabled = 1 `, utils.GetOrmInReplace(len(roleArr)))
 	pars := make([]interface{}, 0)
 	pars = append(pars, roleArr)
 	sellers, e := system.GetSysUserItemsOrderByCreated(cond, pars)

controllers/roadshow/activity.go

@@ -93,6 +93,14 @@ func (this *ActivityController) Add() {
 	startDateTime := req.StartDate + " " + req.StartTime
 	endDateTime := req.EndDate + " " + req.EndTime
 
+	startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
+	endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
+
+	if endP.Before(startP) {
+		this.FailWithMessage("结束时间不得早于开始时间！", "结束时间不得早于开始时间！")
+		return
+	}
+
 	sellerList, err := admin.GetAdminListByIds(req.SellerId)
 	if err != nil {
 		this.FailWithMessage("保存失败！", "获取销售信息失败，Err:"+err.Error())

models/roadshow/activity.go

@@ -106,6 +106,7 @@ type RsActivitySellerResp struct {
 	SysUserRealName        string `description:"创建人名称"`
 	RoadshowType           string `description:"路演形式"`
 	RsCalendarResearcherId int    `description:"活动研究员id（映射供前端使用）"`
+	EnglishCompany         int    `description:"是否为英文客户: 0-否; 1-是"`
 }
 
 type RsActivitySellerListResp struct {
@@ -120,6 +121,7 @@ func GetRsActivitySellerList(condition string, pars []interface{}, startSize, pa
 			b.theme,
 			b.activity_type,
 			b.company_id,
+			b.english_company,
 			b.company_name 
 		FROM
 			rs_activity_seller AS a

models/roadshow/company.go

@@ -154,10 +154,10 @@ func CompanySearchV2(sellerId, groupId int, keyWord, roleTypeCode string) (list
 			     1=1 
 			     AND IF  ( b.product_id = 1 , b.status IN ('正式', '试用', '永续') ,1=1 )  
 			     AND IF  ( b.product_id = 2 , b.status IN ('正式', '试用', '永续', '冻结', '流失') ,1=1 )  
-				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
+				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND ( a.company_name LIKE ?  OR a.credit_code LIKE  ? )
 			GROUP BY
 				b.company_id `
-		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)
+		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord, keyWord).QueryRows(&companies)
 		if err != nil {
 			return
 		}