修复批量更新用户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());

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.dsk.common.core.service.UserService;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.DataBaseHelper;
 import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.DingTalkUtil;
 import com.dsk.common.utils.PasswordUtils;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
@@ -271,15 +272,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         user.setPassword(BCrypt.hashpw(password));
         // 新增用户信息
         int rows = baseMapper.insert(user);
-        if (rows>0) {
+        if (rows > 0) {
             //租户新增成功,发送短信通知租户
             //此处暂用钉钉机器人模拟发送短信
-            String content = "【央企数字经营管理系统通知】："
-                    + user.getNickName()
-                    + "您好，您已经成功注册央企数字经营管理系统，请使用手机号码登录，初始密码为"
+            String content = user.getNickName()
+                    + "您好，您已经成功开通数字化经营管理系统，请使用手机号码登录，初始密码为"
                     + password
-                    + "。友情提示：为了您的账号安全，请立即前往【个人中心】修改密码。";
-//            DingTalkUtil.sendDingTalkMsg(content);
+                    + "。友情提示：为了您的账号安全，请勿泄露密码。";
+            DingTalkUtil.sendDingTalkMsg(content);
         }
         // 新增用户岗位关联
         insertUserPost(user);