|
@ -975,15 +975,15 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
|
if(!saasidValue.equals(null) && !saasidValue.equals("")){
|
|
|
finalSql = finalSql + " and saas. id = '"+saasidValue+"'";
|
|
|
}
|
|
|
// if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
|
|
|
// finalSql = finalSql + " and usr .role_id = '"+roleIdValue+"'";
|
|
|
// }
|
|
|
if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
|
|
|
finalSql = finalSql + " and usr .role_id like '%"+roleIdValue+"%'";
|
|
|
}
|
|
|
finalSql = finalSql + " ORDER BY usr .create_time DESC";
|
|
|
Logger.getAnonymousLogger().info("finalSql="+finalSql);
|
|
|
String sql = finalSql
|
|
|
.replace("{realName}","%" + realName + "%")
|
|
|
.replace("{saasid}",saasidValue);
|
|
|
// .replace("{roleId}",roleIdValue);
|
|
|
.replace("{saasid}",saasidValue)
|
|
|
.replace("{roleId}",roleIdValue);
|
|
|
|
|
|
List<Map<String, Object>> list=null;
|
|
|
if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
|