Merge

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -224,24 +224,21 @@ public class WorkOrderController extends BaseController {
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrderPagePage.getRecords().forEach(e->{
                 if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode()) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId)) ){
-
-               if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode())){
                     e.setIsAudit("0");
                 }
                 else {
                     e.setIsAudit("1");
                 }
-            });
-        }
-
-        workOrderPagePage.getRecords().forEach(e->{
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
                 }
+
             });
+        }
 
         return ResponseHelper.buildResponse(workOrderPagePage);
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/wgpageList")
     @ApiOperation(httpMethod = "GET",value = "无分页查询",  notes = "无分页查询")