|
|
@@ -126,10 +126,12 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
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;
|
|
|
+ if (useRole!=null){
|
|
|
+ for (String s : useRole) {
|
|
|
+ if (AFTConstants.COMPANY_MANAGER.equals(s)){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
List<Role> roleList = roleMapper.selectByIdList(roleIds);
|
|
|
@@ -261,7 +263,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
@Override
|
|
|
public int insertNewAdmin(Admin ad ,List<String> roleIds) {
|
|
|
- ad.setStatus("1");
|
|
|
+ ad.setStatus("0");
|
|
|
ad.setId(UUID.randomUUID().toString());
|
|
|
ad.setType(sumType(roleIds));
|
|
|
|
|
|
@@ -278,6 +280,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
if(ad.getAmbId()!=null)pushAmbRole(ad);
|
|
|
adminMapper.insertSelective(ad);
|
|
|
+ pushAdminRole(ad.getId(),roleIds,null);
|
|
|
return 1;
|
|
|
}
|
|
|
|