88

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -51,8 +51,18 @@
 			  limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="queryUserscount"  resultType="int">
-		 select count(*)  from users y	
+	<select id="queryUserscount" parameterType="java.util.Map" resultType="int">
+		  select count(*)  from (
+		     select      y.user_id,
+				         r.role_name,
+				         y.role_id,
+				         y.username,
+				         y.password,
+				         y.person_name,
+				         y.create_time,
+				         y.update_time
+		         from    users y  
+		 left  join  role  r on  r.role_id=y.role_id
 		 <where>
 		      <if test="roleId!=null and roleId!=''">
 		      	   y.role_id=#{roleId}
@@ -63,10 +73,7 @@
 		      <if test="personName!=null and personName!=''">
 		      	and  y.person_name=#{personName}
 		      </if>
-		 </where>
-		      order by create_time desc
-			  limit #{startPage},#{rowNum}
-	
+		 </where>) temp
 	</select>
 	
 	<!--根据用户id修改角色，账号，密码，名称  -->

saicLogistics/src/main/java/com/fuzamei/mapperInterface/UserMapper.java

@@ -18,7 +18,7 @@ public interface UserMapper {
 	
 	public void deleteFromUserId(String[] userIds);//批量删除，前端传个id字符串来
 	
-	public  int queryUserIdMax();
+	public  int queryUserIdMax();//查询用户表最大id然后+1
 
 	
 	

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -83,8 +83,8 @@ public class UserAction {
 		
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
-			Integer page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); 
-			Integer rowNum = ValidationUtil.checkAndAssignDefaultInt(map.get("rowNum"), 1);
+			Integer page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); //默认第一页
+			Integer rowNum = ValidationUtil.checkMinAndAssignInt(map.get("rowNum"), 1);//每页显示多少条
 			Integer roleId = ValidationUtil.checkBlankIntegerAndAssignNullIfIsBlank(map.get("roleId"));
 			String username = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			String personName = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("personName"));
@@ -95,7 +95,7 @@ public class UserAction {
 			mapToService.put("personName", personName);
 			
 			mapToService.put("startPage", (page - 1) * rowNum);
-			mapToService.put("rowNum", rowNum); // 默认每页显示数据是10条
+			mapToService.put("rowNum", rowNum); // 默认每页显示数据是几条
 			PageDTO  pt = userService.queryUsers(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS,pt);
 		} catch (Exception e) {