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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -218,7 +218,7 @@ public interface IOrgUsrService {
     /**
      * 根据登陆人获取公司列表(关联重点部位)
      */
-    List<CheckObjectDto> companyListByUser(AgencyUserModel user);
+    List<CheckObjectDto> companyListByUser(AgencyUserModel user,String bizOrgCode);
 
     /**
      * 获取登陆人关联机场单位人员信息，部门信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -502,9 +502,10 @@ public class OrgUsrController extends BaseController {
 	@RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
 	public ResponseModel<List<CheckObjectDto>> companyListByUser() {
+		String bizOrgCodeString=	getOrgCode();
 		// 获取登陆人角色
 		AgencyUserModel user = getUserInfo();
-		List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user);
+		List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user,bizOrgCodeString);
 		return ResponseHelper.buildResponse(menus);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1455,7 +1455,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
+	public List<CheckObjectDto> companyListByUser(AgencyUserModel user,String bizOrgCode) {
 		List<CheckObjectDto> list = new ArrayList<>();
 		// 需要角色为机场单位或管理员，其余角色返回空
 		String code = UserRolesEnum.AIRPORTUNIT.getCode();
@@ -1487,10 +1487,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					}
 				});
 				// 返回所在用户单位列表
-				return list.stream().distinct().collect(Collectors.toList());
+				List<CheckObjectDto> lists = list.stream().distinct().collect(Collectors.toList());
+				return lists.stream().filter(i-> !i.getBizOrgCode().equals(bizOrgCode)).collect(Collectors.toList());
 			}
 		}
-		return list;
+		return	list.stream().filter(i-> !i.getBizOrgCode().equals(bizOrgCode)).collect(Collectors.toList());
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java

@@ -76,11 +76,18 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
         if (CollectionUtils.isEmpty(sourceFiles)) {
             return new ArrayList<>();
         }
-        sourceFiles.forEach(s -> {
-            s.setSourceId(sourceId);
-        });
-        boolean flag = this.saveOrUpdateBatch(sourceFiles);
-        return flag ? sourceFiles : Collections.EMPTY_LIST;
+
+//        sourceFiles.forEach(s -> {
+//            s.setSourceId(sourceId);
+//             this.saveOrUpdate(s);
+//        });
+        boolean flag =false;
+        for (SourceFile sourceFile : sourceFiles) {
+            sourceFile.setSourceId(sourceId);
+            flag =this.saveOrUpdate(sourceFile);
+        }
+//        boolean flag = this.saveOrUpdate(sourceFiles);
+        return false ? sourceFiles : Collections.EMPTY_LIST;
     }
 
     /**