1.修改用户，角色中的国际化2.修改用户角色新增已经删除角色报错

src/main/java/com/nis/web/controller/sys/RoleController.java

@@ -173,7 +173,7 @@ public class RoleController extends BaseController {
 	public String checkName(String oldName, String name) {
 		if (name!=null && name.equals(oldName)) {
 			return "true";
-		} else if (name!=null && roleService.getRoleByName(name) == null) {
+		} else if (name!=null && roleService.getAllRoleByName(name) == null) {
 			return "true";
 		}
 		return "false";

src/main/java/com/nis/web/controller/sys/UserController.java

@@ -148,7 +148,7 @@ public class UserController extends BaseController{
 	public String checkLoginName(String oldLoginId, String loginId) {
 		if (loginId !=null && loginId.equals(oldLoginId)) {
 			return "true";
-		} else if (loginId !=null && systemService.getUserByLoginName(loginId) == null) {
+		} else if (loginId !=null && userService.getUserByLoginName(loginId) == null) {
 			return "true";
 		}
 		return "false";

src/main/java/com/nis/web/dao/SysRoleDao.java

@@ -14,5 +14,7 @@ public interface SysRoleDao extends CrudDao<SysRole>{
 	void deleteRoleMenu(SysRole role);
 	
 	List<SysUser> findUserByRole(SysRole role);
+
+	SysRole getAllRoleByName(SysRole r);
    
 }

src/main/java/com/nis/web/dao/SysRoleDao.xml

@@ -36,6 +36,13 @@
 	FROM sys_role r
 	WHERE r.name = #{name} AND r.status = #{DEL_FLAG_NORMAL}
   </select>
+  <!-- 新增时存在的无效名角色 校验也不可添加 -->
+  <select id="getAllRoleByName" resultMap="BaseResultMap">
+	SELECT
+		<include refid="Base_Column_List"/>
+	FROM sys_role r
+	WHERE r.name = #{name}
+  </select>
   
   
   <select id="findAllList" resultMap="BaseResultMap">

src/main/java/com/nis/web/service/RoleService.java

@@ -32,7 +32,13 @@ public class RoleService extends BaseService {
 		r.setName(name);
 		return roleDao.getByName(r);
 	}
-	
+	//获取所有状态角色
+	public SysRole getAllRoleByName(String name) {
+		SysRole r = new SysRole();
+		r.setName(name);
+		return roleDao.getAllRoleByName(r);
+	}
+
 	
 	public void saveOrUpdate(SysRole role) {
 		if (StringUtil.isEmpty(role.getId())){