|
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import com.ruoyi.common.annotation.Log;
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
|
+import com.ruoyi.common.constant.UserConstants;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
@@ -122,6 +123,10 @@ public class SysUserController extends BaseController
|
|
{
|
|
{
|
|
return error("不允许修改超级管理员用户");
|
|
return error("不允许修改超级管理员用户");
|
|
}
|
|
}
|
|
|
|
+ if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName())))
|
|
|
|
+ {
|
|
|
|
+ return error("保存用户'" + user.getLoginName() + "'失败,登录账号已存在");
|
|
|
|
+ }
|
|
user.setSalt(ShiroUtils.randomSalt());
|
|
user.setSalt(ShiroUtils.randomSalt());
|
|
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
|
|
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
|
|
user.setCreateBy(ShiroUtils.getLoginName());
|
|
user.setCreateBy(ShiroUtils.getLoginName());
|