java/xizang.git

			@@ -26,6 +26,7 @@
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -155,7 +156,7 @@
			@PostMapping("/add")
			public AjaxResult add(@Validated @RequestBody SysUser user)
			{
			user.setUserName(user.getPhonenumber());
			user.setUserName(user.getUserName());
			if (!userService.checkUserNameUnique(user))
			{
			return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
			@@ -165,7 +166,7 @@
			return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
			}
			user.setCreateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			user.setPassword(SecurityUtils.encryptPassword("123456"));
			userService.insertUser(user);
			return AjaxResult.success();
			}
			@@ -192,7 +193,9 @@
			}

			user.setUpdateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			if(StringUtils.isNotEmpty(user.getPassword())){
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			}
			return AjaxResult.success(userService.updateUser(user));
			}

			@@ -241,11 +244,15 @@
			@PutMapping("/changeStatus")
			public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
			{
			SysUser loginUser = tokenService.getLoginUser().getUser();
			SysUser user = new SysUser();
			user.setUserId(dto.getUserId());
			user.setStatus(String.valueOf(dto.getStatus()));
			user.setRemark(dto.getRemark());
			// user.setRemark(dto.getRemark());
			user.setUpdateBy(getUsername());
			user.setDisableRemark(dto.getRemark());
			user.setOperatingTime(LocalDateTime.now());
			user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
			return AjaxResult.success(userService.updateUserStatus(user));
			}