From d8c7cda7421aa8ad795f017fec88de6923c1c86f Mon Sep 17 00:00:00 2001
From: rekoe <koukou890@qq.com>
Date: Fri, 25 Mar 2016 15:25:45 +0800
Subject: [PATCH] fix
---
.../java/com/rekoe/module/admin/AdminProjectGroupAct.java | 2 +-
src/main/java/com/rekoe/service/ProjectAuthService.java | 4 ++--
src/main/java/com/rekoe/service/ProjectGroupUsrService.java | 4 ++--
src/main/java/com/rekoe/service/ProjectService.java | 2 +-
src/main/java/com/rekoe/service/SvnUserService.java | 3 +++
src/main/java/com/rekoe/service/UsrService.java | 4 ++--
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java
index b83e8f7..3d60447 100644
--- a/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java
+++ b/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java
@@ -28,7 +28,7 @@ public class AdminProjectGroupAct extends BaseAction {
@Ok("fm:template.admin.project_group.list")
@RequiresPermissions({ "project.group:view" })
@PermissionTag(name = "SVN浏览账号", tag = "SVN账号管理")
- public Pagination list(@Param(value = "pageNumber", df = "1") int page, @Param("pj") String pj) {
+ public Pagination list(@Param(value = "pageNumber", df = "1") Integer page, @Param("pj") String pj) {
return projectGroupService.getObjListByPager(page, 20, Cnd.where("pj", "=", pj));
}
diff --git a/src/main/java/com/rekoe/service/ProjectAuthService.java b/src/main/java/com/rekoe/service/ProjectAuthService.java
index e7ffbb9..4a77c28 100644
--- a/src/main/java/com/rekoe/service/ProjectAuthService.java
+++ b/src/main/java/com/rekoe/service/ProjectAuthService.java
@@ -346,8 +346,8 @@ public class ProjectAuthService extends BaseService<PjAuth> {
* @return 具有相同svn root的项目资源的权限列表
*/
public List<PjAuth> getListByRootPath(String rootPath) {
- Sql sql = Sqls.create("select pj,res,rw,gr,' ' usr,' ' usrname from pj_gr_auth where pj in (select distinct pj from pj where type=@type and path like @like) " + " UNION " + " select a.pj,a.res,a.rw,' ' gr,a.usr,b.name usrname from pj_usr_auth a left join usr b on (a.usr=b.usr) where a.pj in (select distinct pj from pj where type=@type and path like @like) " + " order by res,gr,usr");
- sql.setParam("type", Constants.HTTP_MUTIL).setParam("like", rootPath + "%");
+ Sql sql = Sqls.create("select pj,res,rw,gr,' ' usr,' ' usrname from pj_gr_auth where pj in (select distinct pj from pj where type=@type) " + " UNION " + " select a.pj,a.res,a.rw,' ' gr,a.usr,b.name usrname from pj_usr_auth a left join usr b on (a.usr=b.usr) where a.pj in (select distinct pj from pj where type=@type) " + " order by res,gr,usr");
+ sql.setParam("type", Constants.HTTP_MUTIL);
final List<PjAuth> list = new ArrayList<PjAuth>();
sql.setCallback(new SqlCallback() {
diff --git a/src/main/java/com/rekoe/service/ProjectGroupUsrService.java b/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
index f567cb3..8368e05 100644
--- a/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
+++ b/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
@@ -113,8 +113,8 @@ public class ProjectGroupUsrService extends BaseService<PjGrUsr> {
* @return 有相同的svn root的项目组用户
*/
public List<PjGrUsr> getListByRootPath(String rootPath) {
- Sql sql = Sqls.create("select a.pj,a.gr,b.usr,c.name as usrname from pj_gr a left join pj_gr_usr b on (a.pj=b.pj and a.gr=b.gr) left join usr c on (b.usr=c.usr) " + " where a.pj in (select distinct pj from pj where type=@type and path like @like) order by a.pj,a.gr,b.usr");
- sql.setParam("type", Constants.HTTP_MUTIL).setParam("like", rootPath + "%");
+ Sql sql = Sqls.create("select a.pj,a.gr,b.usr,c.name as usrname from pj_gr a left join pj_gr_usr b on (a.pj=b.pj and a.gr=b.gr) left join usr c on (b.usr=c.usr) " + " where a.pj in (select distinct pj from pj where type=@type) order by a.pj,a.gr,b.usr");
+ sql.setParam("type", Constants.HTTP_MUTIL);
final List<PjGrUsr> list = new ArrayList<PjGrUsr>();
sql.setCallback(new SqlCallback() {
diff --git a/src/main/java/com/rekoe/service/ProjectService.java b/src/main/java/com/rekoe/service/ProjectService.java
index a5351c8..59bc314 100644
--- a/src/main/java/com/rekoe/service/ProjectService.java
+++ b/src/main/java/com/rekoe/service/ProjectService.java
@@ -146,7 +146,7 @@ public class ProjectService extends BaseService<Pj> {
projectGroupService.deletePj(pj);
projectUserService.deletePj(pj);
svnService.exportConfig(pj);
- delete(pj);
+ dao().clear(getEntityClass(), Cnd.where("pj", "=", pj));
}
public void update(Pj pj) {
diff --git a/src/main/java/com/rekoe/service/SvnUserService.java b/src/main/java/com/rekoe/service/SvnUserService.java
index 6b1ef7d..4b4a614 100644
--- a/src/main/java/com/rekoe/service/SvnUserService.java
+++ b/src/main/java/com/rekoe/service/SvnUserService.java
@@ -21,6 +21,9 @@ public class SvnUserService extends BaseService<Usr> {
private final String REGEX_USERNAME = "^[a-zA-Z0-9]{1,16}$";
+ public SvnUserService() {
+ }
+
public SvnUserService(Dao dao) {
super(dao);
}
diff --git a/src/main/java/com/rekoe/service/UsrService.java b/src/main/java/com/rekoe/service/UsrService.java
index ebb02ea..7c9f2cb 100644
--- a/src/main/java/com/rekoe/service/UsrService.java
+++ b/src/main/java/com/rekoe/service/UsrService.java
@@ -67,8 +67,8 @@ public class UsrService extends BaseService<Usr> {
}
public List<Usr> getListByRootPath(String rootPath) {
- Sql sql = Sqls.create("select p.usr,p.name,p.role,CASE WHEN pu.psw IS NOT NULL THEN pu.psw ELSE p.psw END psw from (" + " select a.usr,a.role,a.psw,a.name from usr a " + " where " + " exists (select d.usr from pj_gr_usr d where d.usr=a.usr and d.pj in (select distinct pj from pj where type=@type and path like @like)) " + " or exists(select c.usr from pj_usr_auth c where a.usr=c.usr and c.pj in (select distinct pj from pj where type=@type and path like @like)) " + " ) p " + " left join pj_usr pu on (p.usr=pu.usr) where p.usr <> '*'" + " order by p.usr ");
- sql.setParam("like", rootPath + "%").setParam("type", com.rekoe.utils.Constants.HTTP_MUTIL);
+ Sql sql = Sqls.create("select p.usr,p.name,p.role,CASE WHEN pu.psw IS NOT NULL THEN pu.psw ELSE p.psw END psw from (" + " select a.usr,a.role,a.psw,a.name from usr a " + " where " + " exists (select d.usr from pj_gr_usr d where d.usr=a.usr and d.pj in (select distinct pj from pj where type=@type)) " + " or exists(select c.usr from pj_usr_auth c where a.usr=c.usr and c.pj in (select distinct pj from pj where type=@type)) " + " ) p " + " left join pj_usr pu on (p.usr=pu.usr) where p.usr <> '*'" + " order by p.usr ");
+ sql.setParam("type", com.rekoe.utils.Constants.HTTP_MUTIL);
final List<Usr> list = new ArrayList<Usr>();
sql.setCallback(new SqlCallback() {