From 38d88571385b8bf9c00ab84fa1fe4a16c4a0b9ea Mon Sep 17 00:00:00 2001
From: rekoe <koukou890@qq.com>
Date: Sun, 27 Mar 2016 16:12:38 +0800
Subject: [PATCH] fix

---
 src/main/java/com/rekoe/module/admin/AdminProjectAct.java | 2 ++
 src/main/java/com/rekoe/service/ProjectAuthService.java   | 2 +-
 src/main/java/com/rekoe/service/ProjectService.java       | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
index d9ae8b7..e81508c 100644
--- a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
+++ b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
@@ -136,6 +136,8 @@ public class AdminProjectAct extends BaseAction {
 		} else {
 			res = entity.getRes();
 		}
+		String root = projectConfigService.get().getRepositoryPath()+"/";
+		res = StringUtils.remove(res, root);
 		entity.setRes(res);
 		List<PjAuth> list = projectAuthService.list(pj, res);
 		req.setAttribute("list", list);
diff --git a/src/main/java/com/rekoe/service/ProjectAuthService.java b/src/main/java/com/rekoe/service/ProjectAuthService.java
index 4a77c28..8866b71 100644
--- a/src/main/java/com/rekoe/service/ProjectAuthService.java
+++ b/src/main/java/com/rekoe/service/ProjectAuthService.java
@@ -261,7 +261,7 @@ public class ProjectAuthService extends BaseService<PjAuth> {
 	 * @return 项目组资源的权限
 	 */
 	public PjAuth getByGr(String pj, String gr, String res) {
-		Sql sql = Sqls.create("select pj,res,rw,gr,' ' usr,' ' usrname from pj_gr_auth");
+		Sql sql = Sqls.create("select pj,res,rw,gr,' ' usr,' ' usrname from pj_gr_auth $condition");
 		sql.setCondition(Cnd.where("pj", "=", pj).and("gr", "=", gr).and("res", "=", res));
 		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 59bc314..d68835d 100644
--- a/src/main/java/com/rekoe/service/ProjectService.java
+++ b/src/main/java/com/rekoe/service/ProjectService.java
@@ -70,6 +70,7 @@ public class ProjectService extends BaseService<Pj> {
 	 * @param pj
 	 *            项目
 	 */
+	@Aop(TransAop.READ_COMMITTED)
 	public void save(Pj pj) {
 		// 是否可以增加项目
 		boolean insert = nameOk(pj.getPj());
@@ -116,7 +117,7 @@ public class ProjectService extends BaseService<Pj> {
 		if (p == null) {
 			return pj;
 		}
-		return projectConfigService.getRepoPath(p);
+		return pj;
 	}
 
 	/**
@@ -128,7 +129,7 @@ public class ProjectService extends BaseService<Pj> {
 	 * @since 3.0.3
 	 */
 	public String getRelateRootPath(Pj pj) {
-		return projectConfigService.getRepoPath(pj);
+		return pj.getPj();
 	}
 
 	@Inject