444

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

@@ -13,9 +13,15 @@
 	
 	<!--先去数据库查询 看是否已有的账号不能在重复添加了    -->
 	<select id="findUserById" parameterType="com.fuzamei.entity.User" resultType = "com.fuzamei.entity.User">
-		select * from users where user_id = #{user_id} and  username = #{username}
+		select * from users where user_id = #{userId} or  username = #{username}
 	</select>
 	
+	<!--先去数据库查询 看是否已有的账号不能在修改了  -->
+	<select id="findUserByuserIdandusername" parameterType="com.fuzamei.entity.User" resultType = "com.fuzamei.entity.User">
+		select * from users where user_id != #{userId} and  username = #{username}
+	</select>
+	
+	<!-- 查询账号设置的列表 -->
 	<select id="queryUsers" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
 		select   y.user_id,
 		         r.role_name,
@@ -39,13 +45,17 @@
 		 </where>
 	</select>
 	<!--根据用户id修改角色，账号，密码，名称  -->
-	<update id="updateAccountByUserId" parameterType="java.util.Map">
-		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName} where user_id=#{userId}
+	<update id="updateAccountByUserId" parameterType="com.fuzamei.entity.User">
+		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName},update_time=#{updateTime} where user_id=#{userId}
 	</update>
 	
-	<update id="updataRoleById" parameterType="com.fuzamei.entity.User">
-		update users set role_id = #{role_id} where user_id = #{user_id};
-	</update>
+	
+	
+	
+	
+	
+	
+	
 
 	
 	

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

@@ -11,10 +11,12 @@ public interface UserMapper {
 	public List<Role> getAllRoles();//查询所有角色
 	public List<User> queryUsers(Map<String, Object> map);//查询所有账户列表
 	public void updateAccountByUserId(int userId);//编辑修改用户  根据id
-	
 	public  void inserUsers(User user);//添加账号角色名称
 	
 	
+	
+	
+	
 	public Token getTokenById(Token token);
 	public int insertToken(Token token);
 	public int updateToken(Token token);

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

@@ -22,7 +22,7 @@ public class CarrierServiceImpl implements  CarrierService{
 	public List<User> queryCarriers(Map<String, Object> map) {
 		 List<User>  user= null; 
 			//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
-		    int user_id=(int) map.get("user_id");
+		 Integer user_id=(Integer) map.get("user_id");
 			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看承运商列表
 			if (role.equals(Roles.ADMIN)) {

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

@@ -23,7 +23,7 @@ public class PlannerServiceImpl implements  PlannerService{
 	public List<User> queryPlanner(Map<String, Object> map) {
 	    List<User>  user= null; 
 		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
-	    int user_id=(int) map.get("user_id");
+	    Integer user_id=(Integer) map.get("user_id");
 		//String username=(String) map.get("username");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表
 	    System.out.println(role+"lllllll");

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

@@ -23,7 +23,7 @@ public class ReceivingClerkServiceImpl implements  ReceivingClerkService{
 	public List<User> queryReceivingClerk(Map<String, Object> map) {
 	    List<User>  user= null; 
 		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
-	    int user_id=(int) map.get("user_id");
+	    Integer user_id=(Integer) map.get("user_id");
 		//String username=(String) map.get("username");
 		//System.out.println(username+"kkkkk");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表

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

@@ -22,7 +22,7 @@ public class SupplierServiceImpl implements  SupplierService {
 	@Override
 	public List<User> querySupplier(Map<String, Object> map) {
 		  List<User>  user= null; 
-		    int user_id=(int) map.get("user_id");
+		  Integer user_id=(Integer) map.get("user_id");
 			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看供应商列表
 		/*	if (role.equals(Roles.ADMIN)) {

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

@@ -29,7 +29,7 @@ public class UserServiceImpl  implements  UserService {
 	}
 	public List<User> queryUsers(Map<String, Object> map) {
 		List<User>  user= null; 
-		int user_id=(int) map.get("user_id");
+		Integer user_id=(Integer) map.get("user_id");
 		//String username=(String) map.get("username");
 		//String personName=(String) map.get("personName");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过id 查角色

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

@@ -89,19 +89,6 @@ public class UserAction {
 		}
 	
 	}
-	@PostMapping(value = "/insertUsers")
-	public Map<String,Object> addUser(@Validated(GroupB.class) @RequestBody User user,BindingResult result){
-		System.out.println("添加帐户信息……");
-		Map<String,Object> resultMap = new HashMap<String,Object>();	//存放最终返回结果
-		Integer userId = ValidationUtil.checkAndAssignInt(user.getUserId());//得到前端传来的用户id
-		
-		
-		
-		
-		
-		
-		return resultMap;
-	}
 	/**
 	 * 根据用户id修改账号，密码，名称，角色，信息
 	 * @param data