FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaojiabao
2023-04-11 17:21:19 +08:00
parent 53608b5b35 aeb972f034
commit dbe728db6f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper); List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
Integer valIdFlag = 0; Integer valIdFlag = 0;
for (SarBussionessStand stand :list){ for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() >=1 && !stand.getId().equals(sarBussionessStandEO.getId()))){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){ if (valIdFlag == 0){
return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在"); return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -1
View File
@@ -337,7 +337,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO); List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO);
String valIdFlag = "0"; String valIdFlag = "0";
for (SarStandardsInfo stand :list){ for (SarStandardsInfo stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ if ((list.size() >=1 && !stand.getId().equals(sarStandardsInfoEO.getId()))){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag.equals("0")){ if (valIdFlag.equals("0")){
return Result.error("标准号("+ standnumber +")或标准中文名称("+ sarStandardsInfoEO.getStandName() +")已存在"); return Result.error("标准号("+ standnumber +")或标准中文名称("+ sarStandardsInfoEO.getStandName() +")已存在");