diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
index 4258b59..5119bbe 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
@@ -265,7 +265,15 @@
where a.section_id = bs.id
and bs.project_id = tp.id
and tp.province = p.provinces_number
- and ( tp.province = #{vo.provinceCode} or tp.app_manager_id = #{vo.appManagerId} )
+ and (
+ tp.app_manager_id = #{vo.appManagerId}
+
+ or tp.province in
+
+ #{provinceCode}
+
+
+ )
and a.id not in
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java
index cba6425..e58c4c7 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java
@@ -44,6 +44,7 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ
*/
@ApiModelProperty(value = "省分")
private String provinceCode;
+ private List provinceCodes;
private String provinceName;
/**
* 项目名称
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
index b6a136f..405ea9d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
@@ -853,8 +853,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectRoomVideUploadList(BidElecEvalVideUploadVo vo){
IPage iPage = new Page<>(vo.getPageNo(), vo.getPageSize());
- if(vo.getProvinceCode()==null||"".equals(vo.getProvinceCode())) {
- vo.setProvinceCode(userService.getCacheUser().getOrganizationId());
+ if(vo.getProvinceCodes()==null||vo.getProvinceCodes().size()==0) {
+ List codes = new ArrayList<>();
+ codes.add(userService.getCacheUser().getOrganizationId());
+ vo.setProvinceCodes(codes);
}
vo.setAppManagerId(userService.getCacheUser().getUserId());
return this.projectSectionMapper.getVideoUploadVoPage(iPage,vo);