20180201

saicLogistics/src/main/java/com/fuzamei/entity/User.java

@@ -20,8 +20,9 @@ public class User {
 	private Long updateTime;      	//更新时间
 	private String roleName;		//角色名称
 	private String token;			//令牌
+	
 	private Integer page;				//页数
-	private Integer rowNum;				//单页显示条数量
+	private Integer rowNum;				//每页显示得条数
 	private Integer startPage;			//起始页
 	
 	public Integer getPage() {

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

@@ -73,7 +73,7 @@
 		      <if test="personName!=null and personName!=''">
 		      	and  y.person_name=#{personName}
 		      </if>
-		 </where>) temp
+		 </where>)te 
 	</select>
 	
 	<!--根据用户id修改角色，账号，密码，名称  -->

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

@@ -90,8 +90,8 @@ public class PlannerAction {
 			//String tokenId= (String) map.get("tokenId");
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
-			int plannerId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id  
-			userAuthoricationService.queryUserAuthority(plannerId, Role.PLANNER);//？？？？？？由计划员来配置？？---TODO
+			int plannerId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 管理员根据传计划员id  来配置供应商
+			userAuthoricationService.queryUserAuthority(plannerId);//？？？？？？由计划员来配置？？---TODO
 		    SupplierList=plannerService.queryAllSupplierByPlannerId(plannerId);
 		    SupplierList2=plannerService.queryAllNoSupplierByPlannerId(plannerId);
 		    Map<String, Object>  twolist =new HashMap<String, Object>();

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

@@ -91,7 +91,7 @@ public class SupplierAction {
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			Integer supplierId = ValidationUtil.checkAndAssignInt(map.get("supplierId"));
-			userAuthoricationService.queryUserAuthority(supplierId, Role.SUPPLIER);
+			userAuthoricationService.queryUserAuthority(supplierId);//校验传来得有没有这个id
 		    List<User> plannerList=supplierService.queryPlannerBySupplierId(supplierId);
 		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, plannerList);
 		} catch (Exception e) {

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

@@ -134,13 +134,12 @@ public class UserAction {
 			} else {
 				return JSONUtil.getJsonMap(500, false, "修改失败,该账号已存在了", null);
 			}
-
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, "修改失败", null);
 		}
 
 	}
-
+       
 	/**
 	 * 添加用户
 	 * 

saicLogistics/src/main/resources/spring-mvc.xml

@@ -35,12 +35,12 @@
 	<tx:annotation-driven transaction-manager="transactionManager"
 		proxy-target-class="true" />
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
- 	<mvc:interceptors>
+ <!-- 	<mvc:interceptors>
 		<mvc:interceptor>
-			<!-- 拦截路径 -->
+			拦截路径
 			<mvc:mapping path="/**" />
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
 		</mvc:interceptor>
-	</mvc:interceptors> 
+	</mvc:interceptors>  -->
 </beans>