作者 tangxvhui

bug 修复

@@ -186,13 +186,13 @@ func SeleteGetChanceTypeList(companyid int64) []protocol.ChanceTypeBase { @@ -186,13 +186,13 @@ func SeleteGetChanceTypeList(companyid int64) []protocol.ChanceTypeBase {
186 func SelectCompanyUserList(pageIndex int, pageSize int, companyid int64, userName string) protocol.SelectCompanyUserList { 186 func SelectCompanyUserList(pageIndex int, pageSize int, companyid int64, userName string) protocol.SelectCompanyUserList {
187 datasql := `SELECT b.id,a.id as user_company_id,d.nick_name,c.name AS department_name,c.id AS department_id 187 datasql := `SELECT b.id,a.id as user_company_id,d.nick_name,c.name AS department_name,c.id AS department_id
188 FROM user_company AS a 188 FROM user_company AS a
189 - LEFT JOIN user_department AS b ON a.id = b.user_company_id 189 + LEFT JOIN user_department AS b ON a.id = b.user_company_id and a.enable=1
190 LEFT JOIN department AS c ON b.department_id = c.id 190 LEFT JOIN department AS c ON b.department_id = c.id
191 LEFT JOIN user AS d ON a.user_id = d.id 191 LEFT JOIN user AS d ON a.user_id = d.id
192 - WHERE a.delete_at = 0 AND c.company_id = ? ` 192 + WHERE a.delete_at = 0 AND c.company_id = ? `
193 countsql := `SELECT count(*) 193 countsql := `SELECT count(*)
194 FROM user_company AS a 194 FROM user_company AS a
195 - LEFT JOIN user_department AS b ON a.id = b.user_company_id 195 + LEFT JOIN user_department AS b ON a.id = b.user_company_id AND a.enable=1
196 LEFT JOIN department AS c ON b.department_id = c.id 196 LEFT JOIN department AS c ON b.department_id = c.id
197 LEFT JOIN user AS d ON a.user_id = d.id 197 LEFT JOIN user AS d ON a.user_id = d.id
198 WHERE a.delete_at = 0 AND c.company_id =? ` 198 WHERE a.delete_at = 0 AND c.company_id =? `