Jianghan 5 ヶ月 前
コミット
6075f1ac15

+ 7 - 6
JySEPlatform/service/private_service.go

@@ -232,9 +232,10 @@ func (f *Private) Keydataoption(world string) {
 			"newCount":   len(newIdArr),
 			"chargeType": resp.Data.ChargeType,
 			"current":    resp.Data.Num1,
-			"num2":       resp.Data.Num2, // 每日导出限额
-			"num4":       resp.Data.Num4, // 导出总限额
-			"num3":       resp.Data.Num3, //当日可导出余额
+			"num2":       qu.If(resp.Data.Num2 == 0, nil, resp.Data.Num2), // 每日导出限额
+			"num4":       qu.If(resp.Data.Num4 == 0, nil, resp.Data.Num4), // 导出总限额
+			"num3":       resp.Data.Num3,                                  //当日可导出余额
+			"num5":       resp.Data.Num5,
 		})
 	}
 	infos, ok := Mgo.Find("tagsdata", bson.M{"s_dataid": world}, `{"publishtime":-1}`, nil, false, -1, -1)
@@ -319,9 +320,9 @@ func (f *Private) Keydataaccount(world string) {
 			"newCount":   len(newIdArr),
 			"chargeType": resp.Data.ChargeType,
 			"current":    resp.Data.Num1,
-			"num2":       resp.Data.Num2, // 每日导出限额
-			"num4":       resp.Data.Num4, // 导出总限额
-			"num3":       resp.Data.Num3, //当日可导出余额
+			"num2":       qu.If(resp.Data.Num2 == 0, nil, resp.Data.Num2), // 每日导出限额
+			"num4":       qu.If(resp.Data.Num4 == 0, nil, resp.Data.Num4), // 导出总限额
+			"num3":       resp.Data.Num3,                                  //当日可导出余额
 			"num5":       resp.Data.Num5,
 			"isExport":   qu.If(int64(len(newIdArr)) <= resp.Data.Num1, true, false),
 		}

+ 2 - 1
JySEPlatform/service/resourceRpc.go

@@ -4,6 +4,7 @@ import (
 	"JySEPlatform/util"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
+	qu "app.yhyue.com/moapp/jybase/common"
 	"context"
 	"errors"
 	"log"
@@ -47,7 +48,7 @@ func ChargeRpc(req *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeResp
 // @Description 数据去重rpc
 // @Date 2025/2/10
 func RepeatRpc(req map[string]interface{}) (map[string]bool, error) {
-	client, err := rpc.DialHTTP("tcp", "192.168.3.149:226")
+	client, err := rpc.DialHTTP("tcp", qu.ObjToString(util.Sysconfig["repeat_rpc"]))
 	defer client.Close()
 	if err != nil {
 		return nil, err

+ 0 - 7
JySEPlatform/util/cost_util.go

@@ -94,10 +94,3 @@ func SaveExportLog2(entId, entUserId, count, newCount int, xlsxUrl string, ids [
 	}
 	return
 }
-
-// 获取企业身份可导出的数量
-func getEntLimitNum() int {
-
-	return 0
-
-}