new

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

@@ -86,7 +86,7 @@
 	
 	<!--先去数据库查询 看是否已有的账号不能在修改了  -->
 	<select id="findUserByuserIdandusername" parameterType="com.fuzamei.entity.User" resultType = "int">
-		select count(*) from users where  username = #{username} and user_id!=#{userIdb}
+		select count(*) from users where  username = #{username} and user_id!=#{userIdb} and state=1
 	</select>
 	
 	<!--参数类型为1001,1002,1003等， 批量删除 -->

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

@@ -132,7 +132,7 @@ public class UserAction {
 			 user.setUserId(user_id);
 			 userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			 Integer userIdb = ValidationUtil.checkAndAssignInt(user.getUserIdb());//被操作人Id
-			 userAuthoricationService.queryUserAuthority(userIdb, Roles.PLANNER,Roles.SUPPLIER,Roles.CARRIER,Roles.STOCKER);//这里是判断除了管理员自己外不能修改
+			 userAuthoricationService.queryUserAuthority(userIdb);
 			 ValidationUtil.checkBlankAndAssignString(user.getUsername());//校验账号
 			 ValidationUtil.checkBlankAndAssignString(user.getPassword(),RegexConstant.PWD_REGEX);//校验密码
 			 ValidationUtil.checkBlankAndAssignString(user.getPersonName());//校验名称