|
@@ -377,7 +377,7 @@ public class AuthServiceImpl implements AuthService {
|
|
Integer id = Integer.valueOf(relaIdArr[i]);
|
|
Integer id = Integer.valueOf(relaIdArr[i]);
|
|
//先获取该机构是否与其他机构关联,有则合并
|
|
//先获取该机构是否与其他机构关联,有则合并
|
|
CmBrandAuthPo relationInfo = authMapper.getRelationInfo(id);
|
|
CmBrandAuthPo relationInfo = authMapper.getRelationInfo(id);
|
|
- if(StringUtils.isNotEmpty(relationInfo.getRelationId())&&StringUtils.isNotEmpty(relationInfo.getRelationName())){
|
|
|
|
|
|
+ if(null!=relationInfo&&StringUtils.isNotEmpty(relationInfo.getRelationId())&&StringUtils.isNotEmpty(relationInfo.getRelationName())){
|
|
//避免保存一样的数据
|
|
//避免保存一样的数据
|
|
if(!relationInfo.getRelationId().contains(relaId)&&!relationInfo.getRelationName().contains(relaName)){
|
|
if(!relationInfo.getRelationId().contains(relaId)&&!relationInfo.getRelationName().contains(relaName)){
|
|
relaId=relaId+","+relationInfo.getRelationId();
|
|
relaId=relaId+","+relationInfo.getRelationId();
|