|
@@ -331,6 +331,7 @@ func (this *SysUserController) List() {
|
|
|
pageSize, _ := this.GetInt("PageSize")
|
|
|
currentIndex, _ := this.GetInt("CurrentIndex")
|
|
|
roleId, _ := this.GetInt("RoleId")
|
|
|
+ departmentId, _ := this.GetInt("DepartmentId")
|
|
|
keyWord := this.GetString("KeyWord")
|
|
|
|
|
|
var condition string
|
|
@@ -341,6 +342,11 @@ func (this *SysUserController) List() {
|
|
|
pars = append(pars, roleId)
|
|
|
}
|
|
|
|
|
|
+ if departmentId > 0 {
|
|
|
+ condition += ` AND (sys_department_id1=? OR sys_department_id2=? OR sys_department_id3=?) `
|
|
|
+ pars = append(pars, departmentId, departmentId, departmentId)
|
|
|
+ }
|
|
|
+
|
|
|
if keyWord != "" {
|
|
|
condition += ` AND (sys_real_name LIKE ? OR sys_user_name LIKE ? OR phone LIKE ? OR email LIKE ?) `
|
|
|
pars = utils.GetLikeKeywordPars(pars, keyWord, 4)
|
|
@@ -369,6 +375,7 @@ func (this *SysUserController) List() {
|
|
|
br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ fmt.Println(list)
|
|
|
sysUserList := make([]models.SysUserView, len(list))
|
|
|
for i, user := range list {
|
|
|
sysUserList[i].SysUserId = user.SysUserId
|