Merge branch 'dev/v1.0.4_wjh' into feature/v1.0.4

* dev/v1.0.4_wjh:
  xg

api/internal/logic/coophistorylistlogic.go

@@ -26,17 +26,12 @@ func NewCoopHistoryListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C
 func (l *CoopHistoryListLogic) CoopHistoryList(req *types.CoopHistoryReq) (resp *types.Reply, err error) {
 	resp = &types.Reply{}
 	result, size1, size2, size3, size4 := service.GetPrList(req)
-	if result == nil {
-		resp.Error_code = -1
-		resp.Error_msg = "查询异常"
-	} else {
-		resp.Data = map[string]interface{}{
-			"list":  result,
-			"size1": size1,
-			"size2": size2,
-			"size3": size3,
-			"size4": size4,
-		}
+	resp.Data = map[string]interface{}{
+		"list":  result,
+		"size1": size1,
+		"size2": size2,
+		"size3": size3,
+		"size4": size4,
 	}
 
 	return

api/internal/service/CoopHistoryService.go

@@ -53,7 +53,7 @@ func GetPrList(req *types.CoopHistoryReq) (result []*ResultData, size_1, size_2,
 		return nil, 0, 0, 0, 0
 	}
 	propertyForm := ""
-	m1 := T.CrmMysql.FindOne("config_tenant", map[string]interface{}{"account_id": req.EntAccountId}, "probusfor", "")
+	m1 := T.CrmMysql.FindOne("config_tenant", map[string]interface{}{"entAccountId": req.EntAccountId}, "probusfor", "")
 	if m1 != nil && len(*m1) > 0 {
 		propertyForm = common.ObjToString((*m1)["probusfor"])
 	}