Kaynağa Gözat

试验bug修改

lvy 2 ay önce
ebeveyn
işleme
39bf813f7e

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -731,7 +731,7 @@ public class TrialDetectionController extends BladeController {
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "根据 standardId 查询 样品品种,代号和强度等级", notes = "standardId")
     public R<List<StandardInfoDTO>> getStandardInfoByStandardId( @RequestParam Long standardId) {
-        List<StandardInfo> list = uStandardInfoService.list(Wrappers.<StandardInfo>lambdaQuery().eq(StandardInfo::getStandardId, standardId).eq(StandardInfo::getType, 1));
+        List<StandardInfo> list = uStandardInfoService.list(Wrappers.<StandardInfo>lambdaQuery().eq(StandardInfo::getStandardId, standardId).eq(StandardInfo::getType, 1).eq(StandardInfo::getIsDeleted, 0));
         if (list == null || list.isEmpty()) {
             return R.data(new ArrayList<>());
         }

+ 3 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ExcelTabClientImpl.java

@@ -896,6 +896,9 @@ public class ExcelTabClientImpl implements ExcelTabClient {
             Document doc = Jsoup.parse(htmlString);
             for (Element element : doc.getElementsByAttributeValueStarting("id", "key_")) {
                 String id = element.attr("id");
+                if("key".equals( id)) {
+                    continue;
+                }
                 String text = jsonObject.getString(id);
                 if (text == null || text.trim().isEmpty()) {
                     jsonObject.put(id, "/");