Merge branch 'crm/crm_15.9' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/rai_serve.go

@@ -319,19 +319,19 @@ func (this *RaiServeCoAntroller) List() {
 
 	if status != "" {
 		if status == "正式" {
-			condition = " AND status = '正式' "
+			condition += " AND status = '正式' "
 		} else {
-			condition = " AND status != '正式' "
+			condition += " AND status != '正式' "
 		}
 	}
 
 	if sellerId != "" {
-		condition = " AND seller_id IN (?) "
+		condition += " AND seller_id IN (?) "
 		pars = append(pars, sellerId)
 	}
 
 	if shareSellerId != "" {
-		condition = " AND share_seller_id IN (?) "
+		condition += " AND share_seller_id IN (?) "
 		pars = append(pars, shareSellerId)
 	}
 
@@ -348,11 +348,11 @@ func (this *RaiServeCoAntroller) List() {
 	//如果不是权益管理员和admin、财务，就做可见权限限制
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_RESEARCHR {
 		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER {
-			condition = " AND  (seller_id = ? OR  share_seller_id  = ? ) "
+			condition += " AND  (seller_id = ? OR  share_seller_id  = ? ) "
 			pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 		}
 		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
-			condition = " AND  ( seller_id = ? OR  share_seller_id  = ?  OR   group_id = ? OR  share_group_id = ? ) "
+			condition += " AND  ( seller_id = ? OR  share_seller_id  = ?  OR   group_id = ? OR  share_group_id = ? ) "
 			pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.GroupId, sysUser.GroupId)
 		}
 	}