gsb

xggsve-uc/app/base/db/impl/user/userDao.js

@@ -170,7 +170,7 @@ class UserDao extends Dao {
     sql.push("t2.mobile, t2.realName");
     sql.push("t2.mobile, t2.realName");
     sql.push("FROM uc_user t1");
     sql.push("FROM uc_user t1");
     sql.push("INNER JOIN uc_user_info t2 ON t1.id = t2.id");
     sql.push("INNER JOIN uc_user_info t2 ON t1.id = t2.id");
-    sql.push("INNER JOIN uc_user_role t3 ON t1.id = t3.user_id");
+    sql.push("LEFT JOIN uc_user_role t3 ON t1.id = t3.user_id");
     sql.push("WHERE 1 = 1 ");
     sql.push("WHERE 1 = 1 ");
 
 
     if(params.roleIds && params.roleIds.length > 0) {
     if(params.roleIds && params.roleIds.length > 0) {
@@ -179,8 +179,11 @@ class UserDao extends Dao {
     if(params.uctype) {
     if(params.uctype) {
       sql.push("AND t1.uctype = :uctype");
       sql.push("AND t1.uctype = :uctype");
     }
     }
-    if(params.saas_id) {
-      sql.push("AND t1.saas_id = :saas_id");
+    if(params.uctype) {
+      sql.push("AND t1.uctype = :uctype");
+    }
+    if(params.uctypeId) {
+      sql.push("AND t1.uctypeId = :uctypeId");
     }
     }
 
 
     sql.push("GROUP BY t1.id");
     sql.push("GROUP BY t1.id");