|
|
@@ -96,6 +96,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("uid", ad.getId());
|
|
|
params.put("roles", roleIds);
|
|
|
+ Set<String> useRole = roleMapper.findRoleByUserId(ad.getId());
|
|
|
if (ad.getId() != "1") {
|
|
|
userRoleMapper.deleteByUserId(ad.getId());
|
|
|
if (!roleIds.isEmpty()) {
|
|
|
@@ -107,7 +108,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
ad.setType(sumType(roleIds));
|
|
|
int count=adminMapper.updateByPrimaryKeySelective(ad);
|
|
|
pushAmbRole(ad);
|
|
|
- pushAdminRole(ad.getId(),roleIds);
|
|
|
+ pushAdminRole(ad.getId(),roleIds,useRole);
|
|
|
if (count>0&&ad.getAmbId()!=null){
|
|
|
//进行巴人数计算
|
|
|
// AmbSystem ambSystem = ambSystemMapper.selectByPrimaryKey(Long.valueOf(ad.getAmbId()));
|
|
|
@@ -121,11 +122,19 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
- private void pushAdminRole(String id,List<String>roleIds) {
|
|
|
+
|
|
|
+
|
|
|
+ private void pushAdminRole(String id,List<String>roleIds, Set<String> useRole) {
|
|
|
boolean flag=false;
|
|
|
+ for (String s : useRole) {
|
|
|
+ if (AFTConstants.COMPANY_MANAGER.equals(s)){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
List<Role> roleList = roleMapper.selectByIdList(roleIds);
|
|
|
for (Role role : roleList) {
|
|
|
- if (role.getRoleType().equals(AFTConstants.COMPANY_MANAGER)){
|
|
|
+ if (AFTConstants.COMPANY_MANAGER.equals(role.getRoleType().toString())){
|
|
|
flag=true;
|
|
|
break;
|
|
|
}
|