用户查询为用户名空问题

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -211,6 +211,8 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    public PageEnvelop userInfoList(
            @ApiParam(name = "realName", value = "realName")
            @RequestParam(value = "realName", required = false) String realName,
            @ApiParam(name = "username", value = "username")
            @RequestParam(value = "username", required = false) String username,
            @ApiParam(name = "saasid", value = "saasid")
            @RequestParam(value = "saasid", required = false) String saasid,
            @ApiParam(name = "roleId", value = "roleId")
@@ -219,7 +221,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = userService.userInfoList(realName,saasid, roleId,page,size,wechatId);
        JSONObject result = userService.userInfoList(realName,username,saasid, roleId,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -938,7 +938,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     * @return
     * @throws Exception
     */
    public JSONObject userInfoList(String name,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
    public JSONObject userInfoList(String name,String username,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        List<String>roleList=new ArrayList();
   /*     int start = 0 == page ? page++ : (page - 1) * size;
@@ -1023,6 +1023,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                if(!realName.equals(null) && !realName.equals("")){
                    finalSql = finalSql + " and usr . name LIKE '%"+realName+"%'";
                }
                if(StringUtils.isNoneBlank(username)){
                    finalSql = finalSql + " and usr .username LIKE '%"+username+"%'";
                }
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    finalSql = finalSql + " and saas. id = '"+saasidValue+"'";
                }