|
@@ -43,7 +43,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
|
43
|
43
|
INNER join td_user_type b on a.type_id = b.type_id
|
44
|
44
|
group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
|
45
|
45
|
(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in
|
46
|
|
- (select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
|
|
46
|
+ (select user_id from sys_user_case where is_belong=1 and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
|
47
|
47
|
|
48
|
48
|
if typeid != "" {
|
49
|
49
|
sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
|
|
@@ -62,7 +62,7 @@ func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
|
62
|
62
|
INNER join td_user_type b on a.type_id = b.type_id
|
63
|
63
|
group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
|
64
|
64
|
(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in
|
65
|
|
- (select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
|
|
65
|
+ (select user_id from sys_user_case where is_belong=1 and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
|
66
|
66
|
|
67
|
67
|
if typeid != "" {
|
68
|
68
|
sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
|