|
|
@@ -185,17 +185,18 @@ func (this *LimsBalanceController) GetUserList() {
|
|
|
}
|
|
|
userIds = strings.Trim(userIds, ",")
|
|
|
where = where + " and Id in (" + userIds + ")"
|
|
|
- }else {
|
|
|
- svcuser := limsdataentry.GetLimsDataEntryService(utils.DBE)
|
|
|
- var userrolelist []userRole.Base_RoleList
|
|
|
- userrolelist = svcuser.GetUserByRole("10000180", this.User.AccCode)
|
|
|
- var userIds string
|
|
|
- for _, tmpUser := range userrolelist {
|
|
|
- userIds += strconv.FormatInt(tmpUser.Id,10) + ","
|
|
|
- }
|
|
|
- userIds = strings.Trim(userIds, ",")
|
|
|
- where = where + " and Id in (" + userIds + ")"
|
|
|
}
|
|
|
+ //else {
|
|
|
+ // svcuser := limsdataentry.GetLimsDataEntryService(utils.DBE)
|
|
|
+ // var userrolelist []userRole.Base_RoleList
|
|
|
+ // userrolelist = svcuser.GetUserByRole("10000180", this.User.AccCode)
|
|
|
+ // var userIds string
|
|
|
+ // for _, tmpUser := range userrolelist {
|
|
|
+ // userIds += strconv.FormatInt(tmpUser.Id,10) + ","
|
|
|
+ // }
|
|
|
+ // userIds = strings.Trim(userIds, ",")
|
|
|
+ // where = where + " and Id in (" + userIds + ")"
|
|
|
+ //}
|
|
|
total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "Id", false, &users, where)
|
|
|
var datainfo DataInfo
|
|
|
datainfo.Items = users
|