Merge pull request '导出报表功能添加搜索条件 搜索的搜索功能进行查询参数为空的处理' (#39) from fix_vendor into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/39
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

services/log/implments/ArtDemandLst.service.impl.go

@@ -305,6 +305,7 @@ func (impl *ArtDemandLstServiceImplement) Select(user *models.Usertab, urlParame
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	grmi.DeleteUrlParametersEmpty(&urlParameters)
 	predicates, err := condition.BuildPredicates(urlParameters)
 	if err != nil {
 		return nil, err
@@ -388,10 +389,22 @@ func (impl *ArtDemandLstServiceImplement) ExportExcel(user *models.Usertab, urlP
 	session := engine.NewSession()
 	defer session.Close()
 	condition := DefaultConditionOfArtDemandLstAndPaging
+	grmi.DeleteUrlParametersEmpty(&urlParameters)
 	predicates, err := condition.BuildPredicates(urlParameters)
 	if err != nil {
 		return nil, err
 	}
+	search, exist := urlParameters["search"]
+	if exist {
+		params := map[string]string{
+			meta.ArtDemandLst_DemandId.UrlParameterName: search,
+		}
+		innerPredicates, err := condition.BuildPredicates(params)
+		if err != nil {
+			return nil, err
+		}
+		predicates = append(predicates, innerPredicates...)
+	}
 	dao := dal.NewArtDemandLstDAO(session, user.Pid, user.Userid)
 	result, err := dao.Select(predicates, condition.OrderByFields)
 	if err != nil {