From 4f819b33f9ed253052a3ce3bf5a92adee1ef5f2a Mon Sep 17 00:00:00 2001
From: rekoe <koukou890@qq.com>
Date: Wed, 27 Apr 2016 16:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rekoe/module/admin/AdminProjectAct.java  |  2 +-
 .../rekoe/module/admin/AdminProjectGroupUsrAct.java   |  3 +--
 .../java/com/rekoe/service/ProjectAuthService.java    |  1 +
 .../com/rekoe/service/ProjectGroupUsrService.java     | 11 +++++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
index e251e14..23b4a6d 100644
--- a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
+++ b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java
@@ -137,7 +137,6 @@ public class AdminProjectAct extends BaseAction {
 			entity.setPj(pj);
 			entity.setRes("");
 			entity.setRw("");
-			req.setAttribute("entity", entity);
 		}
 		if (StringUtils.isBlank(res)) {
 			String path = req.getParameter("path");
@@ -156,6 +155,7 @@ public class AdminProjectAct extends BaseAction {
 		req.setAttribute("pjreslist", projectAuthService.getResList(pj));
 		req.setAttribute("pjgrlist", projectGroupService.getList(pj));
 		req.setAttribute("usrList", usrService.getList());
+		req.setAttribute("entity", entity);
 		return pj;
 	}
 
diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectGroupUsrAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectGroupUsrAct.java
index 65bd389..127a49f 100644
--- a/src/main/java/com/rekoe/module/admin/AdminProjectGroupUsrAct.java
+++ b/src/main/java/com/rekoe/module/admin/AdminProjectGroupUsrAct.java
@@ -4,7 +4,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.nutz.dao.Cnd;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -37,7 +36,7 @@ public class AdminProjectGroupUsrAct extends BaseAction {
 	public Pagination list(@Param(value = "pageNumber", df = "1") int page, @Param("pj") String pj, @Param("gr") String gr, HttpServletRequest req) {
 		req.setAttribute("pj", pj);
 		req.setAttribute("gr", gr);
-		return projectGroupUsrService.getObjListByPager(page, 20, Cnd.where("pj", "=", pj).and("gr", "=", gr));
+		return projectGroupUsrService.getList(pj, gr, page);
 	}
 
 	@Inject
diff --git a/src/main/java/com/rekoe/service/ProjectAuthService.java b/src/main/java/com/rekoe/service/ProjectAuthService.java
index 1bed010..1c550d9 100644
--- a/src/main/java/com/rekoe/service/ProjectAuthService.java
+++ b/src/main/java/com/rekoe/service/ProjectAuthService.java
@@ -89,6 +89,7 @@ public class ProjectAuthService extends BaseService<PjAuth> {
 				return list;
 			}
 		});
+		dao().execute(sql);
 		return list;
 	}
 
diff --git a/src/main/java/com/rekoe/service/ProjectGroupUsrService.java b/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
index 8368e05..d5c4675 100644
--- a/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
+++ b/src/main/java/com/rekoe/service/ProjectGroupUsrService.java
@@ -9,10 +9,13 @@ import java.util.List;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
+import org.nutz.dao.pager.Pager;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.sql.SqlCallback;
+import org.nutz.dao.util.Daos;
 import org.nutz.ioc.loader.annotation.IocBean;
 
+import com.rekoe.common.page.Pagination;
 import com.rekoe.domain.PjGrUsr;
 import com.rekoe.utils.Constants;
 
@@ -62,9 +65,11 @@ public class ProjectGroupUsrService extends BaseService<PjGrUsr> {
 	 *            组
 	 * @return 组用户列表
 	 */
-	public List<PjGrUsr> getList(String pj, String gr) {
+	public Pagination getList(String pj, String gr, int page) {
+		Pager pager = dao().createPager(page, 20);
 		Sql sql = Sqls.create("select a.pj,a.usr,a.gr,b.name as usrname from pj_gr_usr a left join usr b on (a.usr = b.usr) where a.pj=@pj and a.gr=@gr order by a.usr");
 		sql.setParam("pj", pj).setParam("gr", gr);
+		sql.setPager(pager);
 		final List<PjGrUsr> list = new ArrayList<PjGrUsr>();
 		sql.setCallback(new SqlCallback() {
 
@@ -76,8 +81,10 @@ public class ProjectGroupUsrService extends BaseService<PjGrUsr> {
 				return list;
 			}
 		});
+		Long counts = Daos.queryCount(dao(), sql.getSourceSql());
+		pager.setRecordCount(Integer.parseInt(counts.toString()));
 		dao().execute(sql);
-		return list;
+		return new Pagination(page, 20, pager.getRecordCount(), list);
 	}
 
 	/**