Merge remote-tracking branch 'origin/master'

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -497,8 +497,7 @@ public class SysUserController {
     }
 
     /**
-     * 通过excel导入数据
-     *
+     * 批量导入用户-通过excel导入数据
      * @param request
      * @param response
      * @return
@@ -515,7 +514,7 @@ public class SysUserController {
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
             MultipartFile file = entity.getValue();// 获取上传文件对象
             ImportParams params = new ImportParams();
-            params.setTitleRows(2);
+            params.setTitleRows(0);
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
@@ -523,14 +522,17 @@ public class SysUserController {
                 for (int i = 0; i < listSysUsers.size(); i++) {
                     SysUser sysUserExcel = listSysUsers.get(i);
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {
-                        // 密码默认为 “123456”
-                        sysUserExcel.setPassword("123456");
+                        // 密码默认为 “s@Gr4n5h1P”
+                        sysUserExcel.setPassword("s@Gr4n5h1P");
                     }
                     // 密码加密加盐
                     String salt = oConvertUtils.randomGen(8);
                     sysUserExcel.setSalt(salt);
                     String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
                     sysUserExcel.setPassword(passwordEncode);
+                    // 登陆账号与工号保持一致
+                    sysUserExcel.setWorkNo(sysUserExcel.getUsername());
+                    sysUserExcel.setDelFlag(0);
                     try {
                         sysUserService.save(sysUserExcel);
                         successLines++;