作者 唐旭辉

bug 修复

@@ -2,6 +2,7 @@ package controllers @@ -2,6 +2,7 @@ package controllers
2 2
3 import ( 3 import (
4 "encoding/json" 4 "encoding/json"
  5 + "fmt"
5 "oppmg/common/log" 6 "oppmg/common/log"
6 "oppmg/models" 7 "oppmg/models"
7 "oppmg/protocol" 8 "oppmg/protocol"
@@ -32,15 +33,15 @@ func (c *AuditController) AuditList() { @@ -32,15 +33,15 @@ func (c *AuditController) AuditList() {
32 msg = protocol.BadRequestParam("1") 33 msg = protocol.BadRequestParam("1")
33 return 34 return
34 } 35 }
35 - beginTime, err := time.Parse("2006-01-02", param.CreateTimeBeginS) 36 + beginTime, err := time.ParseInLocation("2006-01-02", param.CreateTimeBeginS, time.Local)
36 if err == nil && len(param.CreateTimeBeginS) > 0 { 37 if err == nil && len(param.CreateTimeBeginS) > 0 {
37 param.CreateTimeBegin = beginTime.Unix() 38 param.CreateTimeBegin = beginTime.Unix()
38 } 39 }
39 - endTime, err := time.Parse("2006-01-02", param.CreateTimeEndS) 40 + endTime, err := time.ParseInLocation("2006-01-02", param.CreateTimeEndS, time.Local)
40 if err == nil && len(param.CreateTimeEndS) > 0 { 41 if err == nil && len(param.CreateTimeEndS) > 0 {
41 - param.CreateTimeEnd = endTime.Unix() + 864399 42 + param.CreateTimeEnd = endTime.Unix() + 86399
42 } 43 }
43 - 44 + fmt.Println(err, param.CreateTimeBegin, param.CreateTimeEnd)
44 if len(param.StatusS) > 0 { 45 if len(param.StatusS) > 0 {
45 param.Status, _ = strconv.Atoi(param.StatusS) 46 param.Status, _ = strconv.Atoi(param.StatusS)
46 } 47 }
@@ -94,7 +94,7 @@ func buildSqlForAuditList(usercompanyid int64, companyid int64, userid int64) st @@ -94,7 +94,7 @@ func buildSqlForAuditList(usercompanyid int64, companyid int64, userid int64) st
94 err error 94 err error
95 ) 95 )
96 //--------------------------------- 96 //---------------------------------
97 - if permissionObject, err = getAuditUserHasPermission(usercompanyid, userid); err != nil { 97 + if permissionObject, err = getAuditUserHasPermission(userid, usercompanyid); err != nil {
98 unionsql = sql1 + " UNION " + sql2 98 unionsql = sql1 + " UNION " + sql2
99 return fmt.Sprintf(allsql, unionsql) 99 return fmt.Sprintf(allsql, unionsql)
100 } 100 }
@@ -528,6 +528,7 @@ func ValidUserPermission(urlPath string, userid int64, companyid int64) bool { @@ -528,6 +528,7 @@ func ValidUserPermission(urlPath string, userid int64, companyid int64) bool {
528 528
529 permissionObj, err = redisdata.GetUserPermission(userid, permissionbase.CodeName) 529 permissionObj, err = redisdata.GetUserPermission(userid, permissionbase.CodeName)
530 if err != nil { 530 if err != nil {
  531 + //尝试从 数据库取权限 TODO
531 log.Error("未取到权限数据 err:%s", err) 532 log.Error("未取到权限数据 err:%s", err)
532 return false 533 return false
533 } 534 }