修复指定角色时，查询不到数据

zhou-hao · zhou-hao · commit 3b86410852aa · 2016-12-04T00:25:04.000+08:00
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java
@@ -57,12 +57,13 @@ protected QueryParam createSelectByKeyAndRoleIdParam(String key, List<String> ro
         return createQuery()
                 //(id = ? or key = ? or module_id = ? )
                 .nest(id, key).or(Property.key, key).or(moduleId, key).end()
-                //and (role_id like ? or .....)
+                //and ((role_id like ? or .....) or (role_id is null or role_id =''))
                 //遍历roleId,使用 like %% 并将值转为 ,value, 格式进行查询
                 //如果有条件,应该写sql函数,将数据库中的值转为结果集和参数进行对比
-                .nest().each(roleId, roleIds, query -> query::$like$, roleIdValueMapper).end()
-                //and (role_id is null or role_id ='')
-                .nest().isNull(roleId).or().isEmpty(roleId).end()
+                .nest()
+                    .nest().each(roleId, roleIds, query -> query::$like$, roleIdValueMapper).end()
+                    .orNest().isNull(roleId).or().isEmpty(roleId).end()
+                .end()
                 .getParam();
     }
 
