new

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

@@ -11,7 +11,7 @@ public class User  extends  PlannerSupplier{
 	private String tokenId;	
 	private Integer id;             //主键id
 	private Integer userId;	        //用户id
-	private Integer userIdb;	 
+	private Integer userIdb;	     //被操作人
 
 	private String  username;       //账号
 	private String  password;       //密码

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

@@ -24,6 +24,13 @@ public class UserDetail {
 	private Long updateTime;			//更新时间
 	private List<Module> modules;		//模块信息
 	private List<UserDetail> users;		//对应的人员信息
+	private Integer state;				//对应用户的状态
+	public Integer getState() {
+		return state;
+	}
+	public void setState(Integer state) {
+		this.state = state;
+	}
 	public Integer getId() {
 		return id;
 	}

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

@@ -8,6 +8,7 @@
 			u.username,
 			u.person_name,
 			u.random,
+			u.state,
 			u.role_id,
 			r.role_name,
 			t.token
@@ -25,7 +26,6 @@
 			u.username=#{username}
 		and 
 			u.password=#{password}
-		
 	</select>
 	
 	<update id="updateToken">
@@ -53,7 +53,8 @@
 						  person_name,
 						  random,
 						  create_time,
-						  update_time)
+						  update_time,
+						  state)
 					values(#{userId},
 						   #{username},
 						   #{password},
@@ -61,7 +62,8 @@
 						   #{personName},
 						   #{random},
 						   #{createTime},
-						   #{updateTime})
+						   #{updateTime},
+						   #{state})
 	</insert>
 	
 	

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

@@ -53,7 +53,7 @@ public class PlannerServiceImpl implements  PlannerService{
 	public void insertAgainSupplier(User pp) {//得到前端传来所有得供应商ID 做插入操作
 		String supplierIds = pp.getSupplierId();//前端传来的供应商id(格式1111,111,111,111)
 		deleteBeforeSupplierByUserId(Integer.parseInt(pp.getPlannerId()));//删除计划员下面的所有供应商
-		if(supplierIds==null||"".equals(supplierIds)){
+		if(!(supplierIds==null||"".equals(supplierIds))){
 			//下面是【循环添加供应商得id】
 			pp.setSupplierIds(supplierIds.split(","));
 			plannerMapper.insertAgainSupplier(pp);

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

@@ -59,6 +59,7 @@ public class LoginAction {
 				user.setCreateTime(currentTime);
 				user.setUpdateTime(currentTime);
 				user.setToken(token);
+				user.setState(1);
 				loginService.insertAdmin(user);//插入管理员数据（同时更新token）
 				Map<String, Object> map=new LinkedHashMap<String, Object>();
 				map.put("username", user.getUsername());
@@ -74,7 +75,9 @@ public class LoginAction {
 			if(user==null){
 				throw new RuntimeException("用户名或密码错误");
 			}
-			
+			/*if(user.getState()==0){
+				throw new RuntimeException("账号已被删除");
+			}*/
 			if(user.getToken()==null||"".equals(user.getToken())){
 				loginService.insertToken(user.getUserId(), token);
 			} else {