xg

JySEPlatform/client/client.go

@@ -37,8 +37,7 @@ var (
 func (this *Client) AdminIndex() {
 	defer qu.Catch()
 	entId := qu.IntAll(this.GetSession("entId"))
-	entUserArr := JyMysql.Find("entniche_user", map[string]interface{}{"ent_id": entId}, "", "id desc", -1, -1)
-	var result []map[string]interface{}
+	entUserArr := JyMysql.Find("entniche_user", map[string]interface{}{"ent_id": entId, "export_power": 1}, "", "id desc", -1, -1)
 	if entUserArr != nil && *entUserArr != nil && len(*entUserArr) > 0 {
 		for _, v := range *entUserArr {
 			userId := qu.IntAll(v["id"])
@@ -53,11 +52,8 @@ func (this *Client) AdminIndex() {
 				}
 			}
 			v["id"] = encrypt.SE.EncodeString(strconv.Itoa(userId))
-			if Mgo.Count("entniche_rule", map[string]interface{}{"entUserId": userId}) > 0 {
-				result = append(result, v)
-			}
 		}
-		this.T["entUserArr"] = result
+		this.T["entUserArr"] = *entUserArr
 	}
 	this.Render("/client/adminIndex.html")
 }
@@ -164,7 +160,8 @@ func (c *Client) CuserRuleCreate() {
 		data["i_updatetime"] = i_createtime
 		data["s_updateuser"] = sessVal["entUserName"]
 		query := bson.M{
-			"entid": sessVal["entId"],
+			"phone":    sessVal["phone"],
+			"username": sessVal["name"],
 		}
 		entMgoInfo, _ := MgoCus.FindOne("user", query)
 		appid := qu.ObjToString((*entMgoInfo)["appid"])

JySEPlatform/config.json

@@ -248,6 +248,6 @@
   "repeat_rpc": "192.168.3.149:226",
   "jyResourceRpc": {
     "key": "resourcescenter.rpc",
-    "hosts": "192.168.3.207:2379,192.168.3.204:2379"
+    "hosts": "127.0.0.1:2379"
   }
 }

JySEPlatform/go.mod

@@ -3,7 +3,7 @@ module JySEPlatform
 go 1.23
 
 require (
-	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250210091142-fb8960cd7dcd
+	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250213081634-e02639c9ca13
 	app.yhyue.com/moapp/jybase v0.0.0-20241028060726-9b8837ab6e42
 	github.com/Chain-Zhang/pinyin v0.1.3
 	github.com/PuerkitoBio/goquery v1.10.0

JySEPlatform/go.sum

@@ -10,6 +10,8 @@ app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250210060501-c50a397986c3 h1:sNgM
 app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250210060501-c50a397986c3/go.mod h1:XMOANDe25s0foLh1FGWd83Z3BjruJWZzVN1YOqOfqG4=
 app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250210091142-fb8960cd7dcd h1:75h6R/7bZyza5MjoKuOW/kjPRu5UCmUEIT+mZDO/T/w=
 app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250210091142-fb8960cd7dcd/go.mod h1:sT/02sF4CuTIGVzYjVix3lHK4EEJRZssS7mydYyr5m4=
+app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250213081634-e02639c9ca13 h1:Ttv8aCam+IVPntaNDAvt7BgdMUPptOiLuCCflm4DscA=
+app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250213081634-e02639c9ca13/go.mod h1:sT/02sF4CuTIGVzYjVix3lHK4EEJRZssS7mydYyr5m4=
 app.yhyue.com/moapp/jybase v0.0.0-20241028060726-9b8837ab6e42 h1:W4vYVQtoPsSCor6mO1iTjQlucodrxXeN38fKiWkPhE4=
 app.yhyue.com/moapp/jybase v0.0.0-20241028060726-9b8837ab6e42/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

JySEPlatform/service/private_service.go

@@ -217,6 +217,7 @@ func (f *Private) Keydataoption(world string) {
 		ExportNum:  int64(len(exportIds)),
 		DeductNum:  int64(len(newIdArr)),
 		ChargeType: int32(qu.IntAll(tmp["chargeType"])),
+		Source:     1,
 	})
 	if err != nil {
 		log.Fatal("扣费rpc接口调用失败")

JySEPlatform/util/cost_util.go

@@ -3,6 +3,7 @@ package util
 import (
 	qu "app.yhyue.com/moapp/jybase/common"
 	"database/sql"
+	"fmt"
 	"log"
 	"strings"
 	"time"
@@ -88,7 +89,7 @@ func SaveExportLog2(entId, entUserId, count, newCount, chargeType int, xlsxUrl,
 			"isSenior":    2,
 			"ent_id":      entId,
 			"ent_user_id": entUserId,
-			"operator":    name,
+			"operator":    fmt.Sprintf("%s（%s）", name, phone),
 			"source":      1,
 			"filter":      filter,
 		})

JySEPlatform/web/templates/client/adminIndex.html

@@ -139,9 +139,9 @@
                 }
             ],
         });
-        setTimeout(function () {
-            $('#departTable_length').append("<span class='suffix-label-tip'>注：仅展示设置了数据定制导出规则的人员</span>")
-        }, 200)
+        // setTimeout(function () {
+        //     $('#departTable_length').append("<span class='suffix-label-tip'>注：仅展示设置了数据定制导出规则的人员</span>")
+        // }, 200)
     })
 
     function singleSelect1(obj) {