new

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

@@ -26,6 +26,7 @@
 			u.username=#{username}
 		and 
 			u.password=#{password}
+		and u.state=1
 	</select>
 	
 	<update id="updateToken">

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

@@ -136,5 +136,20 @@
 		    	(#{userId},#{operationTypeId},#{userIdb},#{operationTime},#{hash})
 		    </foreach>
 	</insert>
+	
+	<delete id="deleteFromPlannerSupplier">
+		delete 
+			from 
+		planner_supplier 
+			where planner_id in
+		<foreach collection="array" item="userids" open="(" separator="," close=")" >
+            #{userids}
+        </foreach>
+        	or
+        	supplier_id in 
+        <foreach collection="array" item="userids" open="(" separator="," close=")" >
+            #{userids}
+        </foreach>
+	</delete>
 
 </mapper>

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

@@ -24,6 +24,7 @@ public interface UserMapper {
 	
 	public  void insertOperationHistory(User  user);//插入信息到操作记录表
 	public void insertOperationHistoryOfDelete(User user);//将删除多个用户的操作记录插入到操作记录表中
+	public void deleteFromPlannerSupplier(String[] userIds);//删除用户的时候同时删除中间表的信息
 	
 	
 }

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

@@ -133,6 +133,7 @@ public class UserServiceImpl  implements  UserService {
 		Long currentTime = System.currentTimeMillis();//得到当前系统时间
 		String[] strs=user.getUserIds().split(",");
 		userMapper.deleteFromUserId(strs);
+		userMapper.deleteFromPlannerSupplier(strs);//删除中间表
 		
 		//下面往【操作记录】表插入一条数据
 		String sign = user.getSign();

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

@@ -76,9 +76,9 @@ public class LoginAction {
 			if(user==null){
 				throw new RuntimeException("用户名或密码错误");
 			}
-			if(user.getState()==0){
-				throw new RuntimeException("账号已停用，请联系管理员");
-			}
+//			if(user.getState()==0){
+//				throw new RuntimeException("账号已停用，请联系管理员");
+//			}
 			if(user.getToken()==null||"".equals(user.getToken())){
 				loginService.insertToken(user.getUserId(), token);
 			} else {