|
|
@@ -55,8 +55,8 @@ func (this *UserAdminShareHistoryController) OrderList() {
|
|
|
startSize = utils.StartIndex(currentIndex, pageSize)
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
-
|
|
|
- if startDate != "" && endDate != "" { //时间范围
|
|
|
+ condition += ` AND company_id != 16 ` // 过滤弘则
|
|
|
+ if startDate != "" && endDate != "" { //时间范围
|
|
|
startDate += " 00:00:00"
|
|
|
endDate += " 23:59:59"
|
|
|
condition += ` AND create_time BETWEEN ? AND ? `
|
|
|
@@ -67,6 +67,11 @@ func (this *UserAdminShareHistoryController) OrderList() {
|
|
|
condition += ` AND share_id IN (` + adminId + `) `
|
|
|
}
|
|
|
|
|
|
+ //如果不是权益管理员和admin，就做可见权限限制
|
|
|
+ if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
|
|
|
+ condition += ` AND share_id IN (` + strconv.Itoa(sysUser.AdminId) + `) `
|
|
|
+ }
|
|
|
+
|
|
|
if keyWord != "" { //用户姓名，手机号
|
|
|
keyWord = "%" + keyWord + "%"
|
|
|
condition += ` AND (mobile LIKE ? OR real_name LIKE ? ) `
|
xingzai