Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!373

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

@@ -163,7 +163,7 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
     }
 
 
-    @ApiOperation(value = "标准插入已存在的清单")
+    @ApiOperation(value = "当在编辑标准的国家地区的时候,自动添加到国家地区清单中,并且把标准的是否纳入认证清单改为\"是\"")
     @PostMapping("/standardToLaws")
     public ResponseMessage standardToLaws(String countryArea,TimeDto timeDto){
         sarLawsDetailedListService.standardToLaws(countryArea,timeDto);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -724,6 +724,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 }
 
                 sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos);
+                //更新标准是否纳入认证清单
+                sarStandardsInfoDao.updateISRELATEACCESSById("1", Arrays.asList(timeDto.getStandId()) );
                 break;
             }
         }

adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java

@@ -94,8 +94,7 @@ public class SarAdvanceSearchUtil {
             for (int i = 0; i < searchVOList.size(); i++) {
                 String sql = "";
                 SarAdvanceSearchVO searchVO=searchVOList.get(i);
-                if (StringUtils.isNotBlank(searchVO.getValue()));
+                if (StringUtils.isNotBlank(searchVO.getValue())) {
-
 
 
                     switch (searchVO.getType()) {
@@ -137,8 +136,10 @@ public class SarAdvanceSearchUtil {
                             break;
                         default:
                     }
+
                     sqlBuilder.append(sql);
                 }
+            }
             sqlInfo = sqlBuilder.toString();
         }