Browse Source

fix:bug
1.用户新增时的用户名不重复代码校验
2.导入学校报错内容修改

caozixuan 1 year ago
parent
commit
ea5e254b62

+ 5 - 7
src/main/java/cn/com/qmth/print/manage/service/impl/ExamServiceImpl.java

@@ -178,7 +178,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
                 // 计算进度
                 BigDecimal progress = BigDecimal.ZERO;
                 int checkCount = vo.getCheckCount();
-                if (checkCount > 0){
+                if (checkCount > 0) {
                     progress = new BigDecimal(vo.getCheckNormalLCount()).divide(new BigDecimal(checkCount), 4, RoundingMode.HALF_UP);
                     progress = progress.multiply(new BigDecimal(100));
                 }
@@ -208,7 +208,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
                 Year year = Year.now();
                 String examName = (Long.parseLong(year.toString()) + 1) + schoolName;
                 if (examNameDatasource.contains(examName)) {
-                    throw new StatusException(String.format("第[%s]行已有学校名称则,导入不成功", examName));
+                    throw new StatusException(String.format("导入不成功,已有学校名称则[%s]", examName));
                 }
                 ExamEntity examEntity = new ExamEntity();
                 examEntity.setOrgId(defaultOrg.getId());
@@ -260,8 +260,8 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
     /**
      * 拼接导入异常信息
      *
-     * @param excelErrors
-     * @return
+     * @param excelErrors 异常信息
+     * @return 异常返回结果
      */
     private String errorsString(List<ExcelError> excelErrors) {
         StringJoiner sj = new StringJoiner(";");
@@ -269,9 +269,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
             int forint = excelErrors.size() < 10 ? excelErrors.size() : 9;
             for (int i = 0; i < forint; i++) {
                 ExcelError excelError = excelErrors.get(i);
-                StringBuffer sb = new StringBuffer();
-                sb.append("第").append(excelError.getRow()).append("行,").append(excelError.getExcelErrorType());
-                sj.add(sb.toString());
+                sj.add("第" + excelError.getRow() + "行," + excelError.getExcelErrorType());
             }
         }
         return sj.toString();

+ 5 - 0
src/main/java/cn/com/qmth/print/manage/service/impl/UserServiceImpl.java

@@ -44,6 +44,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             if (!loginName.equals(userEntity.getLoginName())) {
                 throw new StatusException("用户名不能修改");
             }
+        } else {
+            // 新增时用户名不能重复
+            if (this.count(new QueryWrapper<UserEntity>().lambda().eq(UserEntity::getLoginName,loginName)) > 0){
+                throw new StatusException("该账号已存在");
+            }
         }
 
         RoleMeta requestUserRole = requestUser.getRole();