Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -64,12 +64,10 @@
                 AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
             </if>
             <if test="map.type != null">
-                and ( hbga.basic_grid_node  is not null
-                or hbga.basic_grid_node = 'all'
-                or hbga.power_station_area_status  is not null
-                or hbga.power_station_design_status  is not null
-                or hbga.power_station_engineering_status  is not null
-                ) and  hbga.basic_grid_node != 'jxsAdmin'
+	           AND ( (hbga.basic_grid_node IS NOT NULL AND hbga.basic_grid_node != 'jxsAdmin' ) 
+	           OR hbga.power_station_area_status IS NOT NULL 
+	           OR hbga.power_station_design_status IS NOT NULL 
+	           OR hbga.power_station_engineering_status IS NOT NULL ) 
             </if>
             <if test="map.ownersName != null and map.ownersName !=''">
                 AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')

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

@@ -208,11 +208,11 @@ public class HygfRectificationOrderController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
-				if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area") && e.getRectificationSource().equals(rectificationSource)){
+				if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area") &&rectificationSource.contains(e.getRectificationSource())){
 					e.setIsAudit("0");
-				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")&& e.getRectificationSource().equals(rectificationSource)){
+				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")&& rectificationSource.contains(e.getRectificationSource())){
 					e.setIsAudit("0");
-				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")&& e.getRectificationSource().equals(rectificationSource)){
+				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")&& rectificationSource.contains(e.getRectificationSource())){
 					e.setIsAudit("0");
 				}else if (longs.contains(delerKfId)){
 					e.setIsAudit("0");