|
|
@@ -185,16 +185,17 @@ func (this *dataExportPackStruct) GetAccountMsg(sess *httpsession.Session, userI
|
|
|
//企业数据导出
|
|
|
if entId := qutil.Int64All(sessVal["entId"]); entId != 0 {
|
|
|
var entPack []map[string]interface{}
|
|
|
- limit := util.Mysql.FindOne("entniche_export_limit", map[string]interface{}{"ent_id": entId, "user_id": qutil.IntAll(sessVal["entUserId"])}, "data_limit,export_nums,max_nums,all_export_nums", "")
|
|
|
+ limit := util.Mysql.SelectBySql(`select data_limit,export_nums,max_nums,all_export_nums from jianyu.entniche_export_limit a
|
|
|
+ where user_id=? and (exists (select 1 from jianyu.entniche_info b where a.ent_id=b.id and b.status>0) or exists (select 1 from jianyu.entniche_wait_empower c where a.ent_id=c.ent_id and c.product_key='qysjllb' and c.end_time>?))`, qutil.IntAll(sessVal["entUserId"]), NowFormat(Date_Full_Layout))
|
|
|
if limit != nil && len(*limit) > 0 {
|
|
|
mp := map[string]interface{}{
|
|
|
"entId": entId, //企业id
|
|
|
"entName": qutil.ObjToString(sessVal["entName"]), //企业名字
|
|
|
"entAllCount": getCurrEntCount(entId), //企业总条数
|
|
|
}
|
|
|
- if (*limit)["data_limit"] != nil {
|
|
|
- data_limit := qutil.IntAll((*limit)["data_limit"]) //个人今日限额
|
|
|
- export_nums := qutil.IntAll((*limit)["export_nums"])
|
|
|
+ if (*limit)[0]["data_limit"] != nil {
|
|
|
+ data_limit := qutil.IntAll((*limit)[0]["data_limit"]) //个人今日限额
|
|
|
+ export_nums := qutil.IntAll((*limit)[0]["export_nums"])
|
|
|
surplusToday := data_limit - export_nums
|
|
|
if surplusToday < 0 {
|
|
|
surplusToday = 0
|
|
|
@@ -203,9 +204,9 @@ func (this *dataExportPackStruct) GetAccountMsg(sess *httpsession.Session, userI
|
|
|
mp["surplusToday"] = surplusToday //今日剩余
|
|
|
mp["usedToday"] = export_nums //今日使用
|
|
|
}
|
|
|
- if (*limit)["max_nums"] != nil {
|
|
|
- max_nums := qutil.IntAll((*limit)["max_nums"])
|
|
|
- all_export_nums := qutil.IntAll((*limit)["all_export_nums"])
|
|
|
+ if (*limit)[0]["max_nums"] != nil {
|
|
|
+ max_nums := qutil.IntAll((*limit)[0]["max_nums"])
|
|
|
+ all_export_nums := qutil.IntAll((*limit)[0]["all_export_nums"])
|
|
|
surplusNums := max_nums - all_export_nums
|
|
|
if surplusNums < 0 {
|
|
|
surplusNums = 0
|
