Commit e1a38856 authored by maoying's avatar maoying

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 44ff7036 073c2f74
...@@ -1239,7 +1239,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1239,7 +1239,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
// 业主单位人员 // 业主单位人员
List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null); List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
// 维保单位人员 // 维保单位人员
List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(CODE, userId); List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0], userId);
if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) { if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
throw new RuntimeException("人员绑定单位重复!"); throw new RuntimeException("人员绑定单位重复!");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment