diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 471cd64b..806c59e7 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -160,6 +160,7 @@ public class WebMvcConfig implements WebMvcConfigurer { //企标标准导入模板下载 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile"); + //doc文檔重新轉換 addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index e6590ca4..c5d1cfad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -86,12 +86,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); - if (esRevisePlans.size()>0){ - return "企标名称不能重复,请更换新的企标名称。"; - }else { +// if (esRevisePlans.size()>0){ +// return "企标名称不能重复,请更换新的企标名称。"; +// }else { esRevisePlanDao.updateById(esRevisePlan); return "操作成功"; - } + // } } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 2b0e8436..938a9036 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -169,7 +169,7 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) + queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); List list = sarBussionessStandEOService.list(queryWrapper); Integer valIdFlag = 0; @@ -177,7 +177,7 @@ public class SarBussionessStandController extends BaseController1){ valIdFlag = stand.getValidFlag(); if (valIdFlag == 0){ - throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在"); + return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在"); } } }