接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/listener/EmployeeImportListener.java

@@ -67,25 +67,17 @@ public class EmployeeImportListener extends AnalysisEventListener<EmployeeImport
     @Override
     public void invoke(EmployeeImportBo userVo, AnalysisContext context) {
 
-        String employeeName = userVo.getEmployeeName();
-        String phonenumber = userVo.getPhonenumber();
-        String agentName = userVo.getAgentName();
-        String shopName = userVo.getShopName();
-
-        if(ObjectUtil.isEmpty(phonenumber)){
-            failureNum++;
-            failureMsg.append("<br/>").append(failureNum).append("、手机号码 ").append(" 不能为空");
-            return;
-        }
-
-        Employee user = this.employeeService.selectUserByUserName(phonenumber);
         try {
+            String employeeName = userVo.getEmployeeName();
+            String phonenumber = userVo.getPhonenumber();
+            String agentName = userVo.getAgentName();
+            String shopName = userVo.getShopName();
+
             if(ObjectUtil.isEmpty(employeeName)){
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、姓名 ").append(" 不能为空");
                 return;
             }
-
             if(ObjectUtil.isEmpty(agentName)){
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、所属代理商 ").append(" 不能为空");
@@ -97,6 +89,12 @@ public class EmployeeImportListener extends AnalysisEventListener<EmployeeImport
                 return;
             }
 
+            if(ObjectUtil.isEmpty(phonenumber)){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、手机号码 ").append(" 不能为空");
+                return;
+            }
+
             Agent agent = agentService.getAgentByName(agentName);
             if(ObjectUtil.isEmpty(agent)){
                 failureNum++;
@@ -109,6 +107,7 @@ public class EmployeeImportListener extends AnalysisEventListener<EmployeeImport
                 failureMsg.append("<br/>").append(failureNum).append("、所属门店 ").append(shopName).append(" 不存在");
                 return;
             }
+            Employee user = this.employeeService.selectUserByUserName(phonenumber);
 
             // 验证是否存在这个用户
             if (ObjectUtil.isNull(user)) {
@@ -137,9 +136,8 @@ public class EmployeeImportListener extends AnalysisEventListener<EmployeeImport
             }
         } catch (Exception e) {
             failureNum++;
-            String msg = "<br/>" + failureNum + "、账号 " + user.getEmployeeName() + " 导入失败：";
+            String msg = "<br/>" + failureNum + "、账号 " + userVo.getEmployeeName() + " 导入失败：";
             failureMsg.append(msg).append(e.getMessage());
-            log.error(msg, e);
         }
     }
 
@@ -154,10 +152,10 @@ public class EmployeeImportListener extends AnalysisEventListener<EmployeeImport
             @Override
             public String getAnalysis() {
                 if (failureNum > 0) {
-                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-                    throw new ServiceException(failureMsg.toString());
+                    failureMsg.insert(0, "数据导入成功共 " + successNum + " 条! 导入失败共 " + failureNum + " 条！错误如下：");
+                    throw new ServiceException(failureMsg.toString(),5001);
                 } else {
-                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
                 }
                 return successMsg.toString();
             }