diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index 4ab81ce3..edbe218c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -78,16 +78,14 @@ public class SarStandardComplianceAssessResultController {
             if (eo.getPosition() == 1) {
                 QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
                 IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME", eo.getStandName().trim());
                 }
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
                 }
-//                if (eo.getType() != null && !eo.getType().trim().equals("")) {
-//                    queryWrapper.like("type",eo.getType().trim());
-//                }
+
                 IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
 
                 while (page.getRecords().remove(null)) ;
@@ -96,24 +94,22 @@ public class SarStandardComplianceAssessResultController {
             } else {
                 QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
                 IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME", eo.getStandName().trim());
                 }
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
                 }
-//                if (eo.getType() != null && !eo.getType().trim().equals("")) {
-//                    queryWrapper.like("type",eo.getType().trim());
-//                }
+
                 IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
-                while (page.getRecords().remove(null)) ;
+                while(page.getRecords().remove(null));
                 return Result.success(page);
             }
         }
     }
 
-    private static class InsertEntity<T> {
+    private static class InsertEntity<T>{
         List<Map> entityList;
         T eo;
     }
@@ -145,7 +141,7 @@ public class SarStandardComplianceAssessResultController {
                 }
                 iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
 
-            } else {
+            }else{
                 List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
                 for (int i = 0; i < insertEntity.entityList.size(); i++) {
                     SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard();
@@ -166,10 +162,10 @@ public class SarStandardComplianceAssessResultController {
     public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
         IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
         QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
-        if (eo.getType() != null) queryWrapper.eq("type", eo.getType());
         if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
-        if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
-        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+//        if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
+//        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+
         IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
         return Result.success(page);
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
index 4601161e..c6496762 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
@@ -91,6 +91,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @ApiModelProperty(value = "在产产品合规信息")
     private String productionCompliance;
 
+    @ApiModelProperty(value = "在产产品不合规信息")
+    @TableField("production_non_compliance")
+    private String productionNonCompliance;
+
     @ApiModelProperty(value = "在产产品不合规应对措施")
     private String productionCountermeasures;
 
@@ -113,6 +117,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @TableField("clause_name")
     private String clauseName;
 
+    @ApiModelProperty(value = "流程UUID")
+    @TableField("type")
+    private String type;
+
 
     private String id;