修复批量更新用户bug

dsk-admin/src/main/java/com/dsk/web/controller/system/SysProfileController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -82,6 +83,8 @@ public class SysProfileController extends BaseController {
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public R<Void> updatePwd(String oldPassword, String newPassword) {
+        oldPassword = new String(Base64.getDecoder().decode(oldPassword));
+        newPassword = new String(Base64.getDecoder().decode(newPassword));
         SysUser user = userService.selectUserById(LoginHelper.getUserId());
         String userName = user.getUserName();
         String password = user.getPassword();

dsk-system/src/main/java/com/dsk/system/listener/SysUserImportListener.java

@@ -86,6 +86,11 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
                 Long userId = user.getUserId();
                 user = BeanUtil.toBean(userVo, SysUser.class);
                 user.setUserId(userId);
+                user.setUserName(userVo.getPhonenumber());
+                user.setDeptId(dept.getDeptId());
+                user.setDept(dept);
+                user.setRoleId(role.getRoleId());
+                user.setRoleIds(new Long[]{role.getRoleId()});
                 ValidatorUtils.validate(user);
                 userService.checkUserAllowed(user);
                 userService.checkUserDataScope(user.getUserId());