|
|
@@ -269,6 +269,16 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
return (Pagination<OrgListBo>) findPage("findOrgListByPage", "findOrgCount", params, pageNo, pageSize);
|
|
|
} else if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
+ List<Integer> provinceList = adminLocationMapper
|
|
|
+ .selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
|
|
|
+ List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
|
|
|
+ provinceList.addAll(cityList);
|
|
|
+ if (null != provinceList && provinceList.size() > 0) {
|
|
|
+ params.put("provinceList", provinceList);
|
|
|
+ }
|
|
|
+ if (null != cityList && cityList.size() > 0) {
|
|
|
+ params.put("cityList", cityList);
|
|
|
+ }
|
|
|
return (Pagination<OrgListBo>) findPage("findAreaManagerOrgListByPage", "findAreaManagerOrgCount", params,
|
|
|
pageNo, pageSize);
|
|
|
}
|
|
|
@@ -371,7 +381,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
return disposeAchievementUserOwner(userIdentityMapper.selectManagerAchievementUserOwner(aid, name));
|
|
|
} else {
|
|
|
- if (TokenManager.hasRole(AFTConstants.SUPERADMIN)|| TokenManager.hasRole(AFTConstants.TECHBROKER) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER)
|
|
|
+ || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
aid = null;
|
|
|
}
|
|
|
return disposeAchievementUserOwner(userIdentityMapper.selectAchievementUserOwner(aid, name));
|
|
|
@@ -383,7 +394,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
return organizationIdentityMapper.selectManagerAchievementOrgOwner(aid, name);
|
|
|
} else {
|
|
|
- if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER)
|
|
|
+ || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
aid = null;
|
|
|
}
|
|
|
return organizationIdentityMapper.selectAchievementOrgOwner(aid, name);
|