Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -3756,6 +3756,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }
         objectList.add(UpdateStandNumberFileList);
         objectList.add(cannotModifyStandNumberFileList);
+        logger.info("修改完成的数据是："+ UpdateStandNumberFileList);
+        logger.info("修改失败的数据是："+ cannotModifyStandNumberFileList);
         return Result.success(objectList);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -898,11 +898,12 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
         wrapper .eq("STAND_TYPE",page.getStandType())
                 .eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort())
+                .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName())
                 .eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber())
                 .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0);
         Integer s=sarStandardsInfoEOService.count(wrapper);
         if (s>0){
-            return Result.error("当前标准编号已存在");
+            return Result.error("当前标准编号或中文名称已存在");
         }else {
             return Result.success();
         }