Merge

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

@@ -189,7 +189,7 @@ public class WorkOrderController extends BaseController {
     public ResponseModel<Page<WorkOrderPage>> queryForwgpage(@RequestBody WorkOrderPage  workOrder
     ) {
 
-	     //当前登录人所属场站
+        //当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 //
 //        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
@@ -223,25 +223,22 @@ public class WorkOrderController extends BaseController {
         Page<WorkOrderPage> workOrderPagePage = workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(), workOrder.getSize(), workOrder);
         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");
-               }
+                if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode()) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId)) ){
+                    e.setIsAudit("0");
+                }
+                else {
+                    e.setIsAudit("1");
+                }
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                }
+
             });
         }
 
-        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 = "无分页查询")