snihwxf пре 2 месеци
родитељ
комит
c14f92f7df

+ 1 - 0
src/main/java/com/xjrsoft/config/FileCheckRuleConfig.java

@@ -82,6 +82,7 @@ public final class FileCheckRuleConfig {
                     "application/wps-office.wpt",
                     "application/wps-office.ett",
                     "application/wps-office.dpt",
+                    "application/kswps",
                     // OFD MIME 类型
                     "application/ofd",
                     "application/x-ofd",

+ 2 - 0
src/main/java/com/xjrsoft/module/personnel/service/impl/CarMessageApplyServiceImpl.java

@@ -78,6 +78,7 @@ public class CarMessageApplyServiceImpl extends MPJBaseServiceImpl<CarMessageApp
                 new QueryWrapper<CarMessageApply>().lambda()
                         .eq(CarMessageApply::getCarNumber, dto.getCarNumber())
                         .eq(CarMessageApply::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(CarMessageApply::getStatus,1)
         );
         if(countByCarNumber > 0){
             throw new MyException("已存在该车牌号");
@@ -87,6 +88,7 @@ public class CarMessageApplyServiceImpl extends MPJBaseServiceImpl<CarMessageApp
                 new QueryWrapper<CarMessageApply>().lambda()
                         .eq(CarMessageApply::getUserId, dto.getUserId())
                         .eq(CarMessageApply::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(CarMessageApply::getStatus,1)
         );
         if(count > 2){
             throw new MyException("已添加2辆车,无法继续添加");