diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionRegistrationMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionRegistrationMapper.java
index aad43c269..68c48717b 100644
--- a/competition/src/main/java/com/huoran/competition/mapper/CompetitionRegistrationMapper.java
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionRegistrationMapper.java
@@ -47,6 +47,7 @@ public interface CompetitionRegistrationMapper extends BaseMapper<CompetitionReg
 
     Integer accountExist(@Param("account")String adminAccount);
 
+//    sql修改，由学号修改为账号进行查询
     List<HrUserAccount> selectAccountByWorkNumber(@Param("workNumber")String workNumber, @Param("schoolId")Integer schoolId);
 
     HrUserAccount selectAccount(@Param("accountId")Integer accountId);
diff --git a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionRegistrationMapper.xml b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionRegistrationMapper.xml
index 7b01f5c34..2d3ed8f96 100644
--- a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionRegistrationMapper.xml
+++ b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionRegistrationMapper.xml
@@ -280,7 +280,7 @@
         SELECT a.*,i.user_name
         from nakadai.hr_user_account a,nakadai.hr_user_info i
         WHERE a.is_del = 0
-          and a.work_number = #{workNumber}
+          and a.account = #{workNumber}
           and i.is_del = 0
           and a.user_id = i.user_id
           and a.type = 1
diff --git a/competition/src/main/java/com/huoran/competition/service/impl/CompetitionRegistrationServiceImpl.java b/competition/src/main/java/com/huoran/competition/service/impl/CompetitionRegistrationServiceImpl.java
index 23b920d0f..f6c6ed275 100644
--- a/competition/src/main/java/com/huoran/competition/service/impl/CompetitionRegistrationServiceImpl.java
+++ b/competition/src/main/java/com/huoran/competition/service/impl/CompetitionRegistrationServiceImpl.java
@@ -548,13 +548,19 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                 errorMessage.append("队长/成员姓名不能为空;");
             }
             if (StringUtils.isEmpty(teamInfo.getWorkNumber())) {
-                errorMessage.append("队长/成员学号不能为空;");
+                errorMessage.append("队长/成员账号不能为空;");
             }else {
-                Pattern pattern = Pattern.compile("^[a-zA-Z0-9]+$", Pattern.CASE_INSENSITIVE);
+//                Pattern pattern = Pattern.compile("^[a-zA-Z0-9]+$", Pattern.CASE_INSENSITIVE);
+//                Matcher matcher = pattern.matcher(teamInfo.getWorkNumber());
+//                if (!matcher.matches()) {
+//                    errorMessage.append("队长/成员学号只能包含字母和数字;");
+//                }
+                Pattern pattern = Pattern.compile("^9\\d+$");
                 Matcher matcher = pattern.matcher(teamInfo.getWorkNumber());
                 if (!matcher.matches()) {
-                    errorMessage.append("队长/成员学号只能包含字母和数字;");
+                    errorMessage.append("队长/成员账号不存在;");
                 }
+
             }
             if (StringUtils.isNotEmpty(teamInfo.getUserPhoneNumber())) {
                 if (!validPhoneNum(teamInfo.getUserPhoneNumber())) {
@@ -578,16 +584,19 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
             if (schoolId == 0) {
 
                 List<HrUserAccount> userAccounts = baseMapper.selectAccountByWorkNumber(teamInfo.getWorkNumber(), teamInfo.getStudentAccountOwnershipId());
-                if (userAccounts.size() > 0) {
-                    userAccount = userAccounts.get(0);
-                }
-                if (userAccounts.size() > 1) {
-                    errorMessage.append("账号数据异常，联系管理员进行数据排查;");
+                if (userAccounts.isEmpty() | userAccounts.size()==0) {
+                    errorMessage.append("用户账号不存在;");
+                }else {
+                    if (userAccounts.size() > 1) {
+                        errorMessage.append("账号数据异常，联系管理员进行数据排查;");
+                    }else {
+                        userAccount = userAccounts.get(0);
+                    }
                 }
                 if (userAccount != null) {
                     //学号相同，用户姓名不一致报错
                     if (!userAccount.getUserName().equals(teamInfo.getStudentName())) {
-                        errorMessage.append("学号已存在，用户姓名不一致，用户无法添加;");
+                        errorMessage.append("账号与用户姓名不一致，核对后再添加;");
                     }
                     //更新用户手机号
                     if (StringUtils.isEmpty(userAccount.getPhone()) && StringUtils.isNotEmpty(teamInfo.getUserPhoneNumber())){
@@ -605,16 +614,19 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
 
             } else {
                 List<HrUserAccount> userAccounts = baseMapper.selectAccountByWorkNumber(teamInfo.getWorkNumber(), schoolId);
-                if (userAccounts.size() > 0) {
-                    userAccount = userAccounts.get(0);
-                }
-                if (userAccounts.size() > 1) {
-                    errorMessage.append("账号数据异常，联系管理员进行数据排查;");
+                if (userAccounts.isEmpty() | userAccounts.size()==0) {
+                    errorMessage.append("学生账号不存在;");
+                }else {
+                    if (userAccounts.size() > 1) {
+                        errorMessage.append("账号数据异常，联系管理员进行数据排查;");
+                    }else {
+                        userAccount = userAccounts.get(0);
+                    }
                 }
                 if (userAccount != null) {
                     //学号相同，用户姓名不一致报错
                     if (!userAccount.getUserName().equals(teamInfo.getStudentName())) {
-                        errorMessage.append("学号已存在，用户姓名不一致，用户无法添加;");
+                        errorMessage.append("账号与用户姓名不一致，核对后再添加;");
                     }
                     //更新用户手机号
                     if (StringUtils.isEmpty(userAccount.getPhone()) && StringUtils.isNotEmpty(teamInfo.getUserPhoneNumber())){
@@ -661,7 +673,7 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                     for (ExcelImpTeamReq matchingTeam : matchingTeams) {
                         ImportTeamFailureVo teamFailureVo = new ImportTeamFailureVo();
                         BeanUtils.copyProperties(matchingTeam, teamFailureVo);
-                        teamFailureVo.setFailureMsg("同一学校存在重复学号;");
+                        teamFailureVo.setFailureMsg("同一学校存在重复账号;");
                         teamFailureVos.add(teamFailureVo);
                     }
                     // 将匹配团队添加到待移除列表
@@ -1190,13 +1202,19 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                 errorMessage.append("学生姓名不能为空;");
             }
             if (StringUtils.isEmpty(personalInfo.getWorkNumber())) {
-                errorMessage.append("学号不能为空;");
+                errorMessage.append("账号不能为空;");
             }else {
-                Pattern pattern = Pattern.compile("^[a-zA-Z0-9]+$", Pattern.CASE_INSENSITIVE);
+//                Pattern pattern = Pattern.compile("^[a-zA-Z0-9]+$", Pattern.CASE_INSENSITIVE);
+//                Matcher matcher = pattern.matcher(personalInfo.getWorkNumber());
+//                if (!matcher.matches()) {
+//                    errorMessage.append("学号只能包含字母和数字;");
+//                }
+                Pattern pattern = Pattern.compile("^9\\d+$");
                 Matcher matcher = pattern.matcher(personalInfo.getWorkNumber());
                 if (!matcher.matches()) {
-                    errorMessage.append("学号只能包含字母和数字;");
+                    errorMessage.append("账号不存在;");
                 }
+
             }
             if (StringUtils.isNotEmpty(personalInfo.getUserPhoneNumber())) {
                 if (!validPhoneNum(personalInfo.getUserPhoneNumber())) {
@@ -1243,7 +1261,7 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                     for (ExcelImpPersonalReq matchingPersonal : matchingPersonals) {
                         ImportPersonaFailureVo personaFailureVo = new ImportPersonaFailureVo();
                         BeanUtils.copyProperties(matchingPersonal, personaFailureVo);
-                        personaFailureVo.setFailureMsg("同一学校存在重复学号;");
+                        personaFailureVo.setFailureMsg("同一学校存在重复账号;");
                         personaFailureVos.add(personaFailureVo);
                     }
                     // 将匹配团队添加到待移除列表
@@ -1377,18 +1395,28 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                 Integer accountId = null;
                 if (schoolId==0){
                     List<HrUserAccount> userAccounts = baseMapper.selectAccountByWorkNumber(excelImpPersonalReq.getWorkNumber(), excelImpPersonalReq.getStudentAccountOwnershipId());
-                    if (userAccounts.size()>0){
-                        userAccount = userAccounts.get(0);
-                    }
-                    if (userAccounts.size()>1){
+                    if (userAccounts.isEmpty() | userAccounts.size()==0) {
                         ImportPersonaFailureVo personaFailureVo = new ImportPersonaFailureVo();
                         BeanUtils.copyProperties(excelImpPersonalReq, personaFailureVo);
-                        personaFailureVo.setFailureMsg("数据异常，联系管理员进行数据排查;");
+                        personaFailureVo.setFailureMsg("用户账号不存在;");
                         personaFailureVos.add(personaFailureVo);
                         // 如果不存在，则从list中移除该对象
                         iterator.remove();
                         continue;
+                    }else {
+                        if (userAccounts.size() > 1) {
+                            ImportPersonaFailureVo personaFailureVo = new ImportPersonaFailureVo();
+                            BeanUtils.copyProperties(excelImpPersonalReq, personaFailureVo);
+                            personaFailureVo.setFailureMsg("数据异常，联系管理员进行数据排查;");
+                            personaFailureVos.add(personaFailureVo);
+                            // 如果不存在，则从list中移除该对象
+                            iterator.remove();
+                            continue;
+                        }else {
+                            userAccount = userAccounts.get(0);
+                        }
                     }
+
                     if (userAccount!=null){
                         accountId = userAccount.getId();
                         //学号相同，用户姓名不一致报错
@@ -1421,17 +1449,26 @@ public class CompetitionRegistrationServiceImpl extends ServiceImpl<CompetitionR
                     }
                 }else {
                     List<HrUserAccount> userAccounts = baseMapper.selectAccountByWorkNumber(excelImpPersonalReq.getWorkNumber(), schoolId);
-                    if (userAccounts.size()>0){
-                        userAccount = userAccounts.get(0);
-                    }
-                    if (userAccounts.size()>1){
+                    if (userAccounts.isEmpty() | userAccounts.size()==0) {
                         ImportPersonaFailureVo personaFailureVo = new ImportPersonaFailureVo();
                         BeanUtils.copyProperties(excelImpPersonalReq, personaFailureVo);
-                        personaFailureVo.setFailureMsg("数据异常，联系管理员进行数据排查;");
+                        personaFailureVo.setFailureMsg("学生账号不存在;");
                         personaFailureVos.add(personaFailureVo);
                         // 如果不存在，则从list中移除该对象
                         iterator.remove();
                         continue;
+                    }else {
+                        if (userAccounts.size() > 1) {
+                            ImportPersonaFailureVo personaFailureVo = new ImportPersonaFailureVo();
+                            BeanUtils.copyProperties(excelImpPersonalReq, personaFailureVo);
+                            personaFailureVo.setFailureMsg("数据异常，联系管理员进行数据排查;");
+                            personaFailureVos.add(personaFailureVo);
+                            // 如果不存在，则从list中移除该对象
+                            iterator.remove();
+                            continue;
+                        }else {
+                            userAccount = userAccounts.get(0);
+                        }
                     }
                     if (userAccount!=null){
                         accountId = userAccount.getId();
diff --git a/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml b/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml
index a434e9418..9a0ebc918 100644
--- a/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml
@@ -90,6 +90,7 @@
         ca.loan_application_amount,
         ca.total_interest_amount,
         ca.loan_amount,
+        ca.loan_application_date,
         pi.business_status,
         pi.debt_paying_ability,
         pi.credit_status,