...
|
...
|
@@ -189,13 +189,13 @@ func SelectCompanyUserList(pageIndex int, pageSize int, companyid int64, userNam |
|
|
LEFT JOIN user_department AS b ON a.id = b.user_company_id AND b.enable_status=1
|
|
|
LEFT JOIN department AS c ON b.department_id = c.id
|
|
|
LEFT JOIN user AS d ON a.user_id = d.id
|
|
|
WHERE a.delete_at = 0 AND c.company_id = ? `
|
|
|
WHERE a.delete_at = 0 AND a.enable=1 AND c.company_id = ? `
|
|
|
countsql := `SELECT count(*)
|
|
|
FROM user_company AS a
|
|
|
LEFT JOIN user_department AS b ON a.id = b.user_company_id AND b.enable_status=1
|
|
|
LEFT JOIN department AS c ON b.department_id = c.id
|
|
|
LEFT JOIN user AS d ON a.user_id = d.id
|
|
|
WHERE a.delete_at = 0 AND c.company_id =? `
|
|
|
WHERE a.delete_at = 0 AND a.enable=1 AND c.company_id =? `
|
|
|
cond := []interface{}{companyid}
|
|
|
where := ""
|
|
|
if len(userName) > 0 {
|
...
|
...
|
|