new

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

@@ -103,12 +103,8 @@
 			u.person_name
 		from 
 			users u
-		left join 
-			role r
-		on 
-			u.role_id=r.role_id
 		where 
-			r.role_name=#{roleName}
+			u.role_id=3
 	</select>
 	
 	<select id="verificationToken" resultType="int">

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

@@ -13,7 +13,7 @@ public interface UserAuthoricationMapper {
 
 	UserDetail queryUserAuthority(Integer userId);//查询简单用户信息
 
-	List<UserDetail> showAllCarriersUnderSupplier(Params params);//查询所有承运商信息
+	List<UserDetail> showAllCarriersUnderSupplier();//查询所有承运商信息
 
 	int verificationToken(@Param("userId")int userId, @Param("token") String token);//根据用户id和token值查看用户是否存在
 

saicLogistics/src/main/java/com/fuzamei/service/UserAuthoricationService.java

@@ -10,7 +10,7 @@ public interface UserAuthoricationService {
 
 	UserDetail queryUserAuthority(Integer userId, String... roleNames);
 
-	List<UserDetail> showAllCarriersUnderSupplier(Params params);
+	List<UserDetail> showAllCarriersUnderSupplier();
 
 	boolean verificationToken(int userId, String token);
 }

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserAuthoricationServiceImpl.java

@@ -60,8 +60,8 @@ public class UserAuthoricationServiceImpl implements UserAuthoricationService {
 	}
 
 	@Override
-	public List<UserDetail> showAllCarriersUnderSupplier(Params params) {
-		return userAuthoricationMapper.showAllCarriersUnderSupplier(params);
+	public List<UserDetail> showAllCarriersUnderSupplier() {
+		return userAuthoricationMapper.showAllCarriersUnderSupplier();
 	}
 
 	@Override

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

@@ -178,13 +178,11 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showAllCarriersUnderSupplier",method=RequestMethod.POST)
-	public Map<String, Object> showAllCarriersUnderSupplier(@RequestBody Params params){
+	public Map<String, Object> showAllCarriersUnderSupplier(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
-			params.setUserId(Integer.parseInt(userId));
 			userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
-			params.setRoleName(Role.CARRIER);
-			List<UserDetail> carrierList = userAuthoricationService.showAllCarriersUnderSupplier(params);
+			List<UserDetail> carrierList = userAuthoricationService.showAllCarriersUnderSupplier();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, carrierList);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

saicLogistics/src/test/java/com/fuzamei/web/CargoConsignActionTest.java

@@ -56,7 +56,7 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 	public void test03(){
 		Params params=new Params();
 		params.setUserId(9005);
-		Map<String, Object> result = cargoConsignAction.showAllCarriersUnderSupplier(params);
+		Map<String, Object> result = cargoConsignAction.showAllCarriersUnderSupplier();
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}