修复用户批量操作bug

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

@@ -111,7 +111,7 @@ public class SysUserController extends BaseController {
     public R<List<SysUserImportVo>> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
         List<SysUserImportVo> resultList = result.getList();
-        if (ObjectUtil.isNotNull(resultList)) {
+        if (!resultList.isEmpty()) {
             String key = GlobalConstants.BATCH_IMPORT_FAIL_USERS + LoginHelper.getUserId();
             RedisUtils.setCacheList(key, resultList);
             return R.fail(resultList);

dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserImportVo.java

@@ -23,30 +23,32 @@ public class SysUserImportVo implements Serializable {
     /**
      * 所属部门
      */
+    @ExcelProperty(value = "*所属部门")
     private String deptName;
 
     /**
      * 用户昵称
      */
-    @ExcelProperty(value = "用户昵称")
+    @ExcelProperty(value = "*用户昵称")
     private String nickName;
 
     /**
      * 手机号码
      */
-    @ExcelProperty(value = "手机号码")
+    @ExcelProperty(value = "*手机号码")
     private String phonenumber;
 
     /**
      * 用户角色
      */
-    @ExcelProperty(value = "用户角色")
+    @ExcelProperty(value = "*用户角色")
     private String roleName;
 
     /**
      * 失败原因
      * 该字段无需同步到模板中
      */
+    @ExcelProperty(value = "失败原因")
     private String failReason;
 
     public SysUserImportVo(String deptName, String nickName, String phonenumber, String roleName) {

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

@@ -229,12 +229,11 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         //租户新增成功,发送短信通知租户
         //此处暂用钉钉机器人模拟发送短信
         String content = "【央企数字经营管理系统通知】："
-                + bo.getCompanyName()
+                + bo.getContactUserName()
                 + "您好，您已经成功注册央企数字经营管理系统，请使用手机号码登录，初始密码为"
                 + password
                 + "。友情提示：为了您的账号安全，请勿泄露密码。若需要修改密码，请联系管理员。";
         DingTalkUtil.sendDingTalkMsg(content);
-        System.out.println("👉🏻:" + content);
         return true;
     }