用户导入bug解决

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

@@ -99,7 +99,8 @@ public class SysUserController extends BaseController
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = ShiroUtils.getSysUser().getLoginName();
-        String message = userService.importUser(userList, updateSupport, operName);
+        Long companyId = ShiroUtils.getCompanyId();
+        String message = userService.importUser(userList, updateSupport, operName,companyId);
         return AjaxResult.success(message);
     }
 

dgtly-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -178,7 +178,7 @@ public interface ISysUserService
      * @param operName 操作用户
      * @return 结果
      */
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName,Long companyId);
 
     /**
      * 用户状态修改

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

@@ -426,12 +426,13 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName,Long companyId)
     {
         if (StringUtils.isNull(userList) || userList.size() == 0)
         {
             throw new BusinessException("导入用户数据不能为空！");
         }
+
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -441,15 +442,25 @@ public class SysUserServiceImpl implements ISysUserService
         {
             try
             {
+
+                if(user.getCompanyId()==null){
+                    user.setCompanyId(companyId);
+                }
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByLoginName(user.getLoginName());
                 if (StringUtils.isNull(u))
                 {
-                    user.setPassword(Md5Utils.hash(user.getLoginName() + password));
-                    user.setCreateBy(operName);
-                    this.insertUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getLoginName() + " 导入成功");
+                    SysUser sysUser = userMapper.selectUserById(user.getUserId());
+                    if(StringUtils.isNull(sysUser)){
+                        user.setPassword(Md5Utils.hash(user.getLoginName() + password));
+                        user.setCreateBy(operName);
+                        this.insertUser(user);
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、账号 " + user.getLoginName() + " 导入成功");
+                    }else{
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、用户序号 " + user.getUserId() + " 已存在");
+                    }
                 }
                 else if (isUpdateSupport)
                 {
@@ -463,6 +474,10 @@ public class SysUserServiceImpl implements ISysUserService
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getLoginName() + " 已存在");
                 }
+
+
+
+
             }
             catch (Exception e)
             {