|
|
@@ -101,9 +101,9 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
TokenManager.clearUserAuthByUserId(ad.getId());
|
|
|
}
|
|
|
- pushAmbRole(ad);
|
|
|
ad.setType(sumType(roleIds));
|
|
|
int count=adminMapper.updateByPrimaryKeySelective(ad);
|
|
|
+ pushAmbRole(ad);
|
|
|
if (count>0&&ad.getAmbId()!=null){
|
|
|
//进行巴人数计算
|
|
|
// AmbSystem ambSystem = ambSystemMapper.selectByPrimaryKey(Long.valueOf(ad.getAmbId()));
|
|
|
@@ -247,10 +247,9 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
TokenManager.clearUserAuthByUserId(ad.getId());
|
|
|
}
|
|
|
- pushAmbRole(ad);
|
|
|
-
|
|
|
-
|
|
|
- return adminMapper.insertSelective(ad);
|
|
|
+ if(ad.getAmbId()!=null)pushAmbRole(ad);
|
|
|
+ adminMapper.insertSelective(ad);
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -258,17 +257,22 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
* @param ad
|
|
|
*/
|
|
|
private void pushAmbRole(Admin ad) {
|
|
|
- Admin use = adminMapper.selectByPrimaryKey(ad.getId());
|
|
|
- AmbSystem ambSystem = ambSystemMapper.selectByPrimaryKey(Long.valueOf(ad.getAmbId()));
|
|
|
- if (ambSystem.getLvl() == 5 || ambSystem.getLvl() == 6) {
|
|
|
- if (use.getAmbRole() == null) {
|
|
|
- ad.setAmbRole("7");
|
|
|
- } else {
|
|
|
- if (!use.getAmbRole().contains("7")) {
|
|
|
- ad.setAmbRole(use.getAmbRole() + ",7");
|
|
|
+ if (ad.getId()!=null){
|
|
|
+ ad.setAmbRole("7");
|
|
|
+ }else {
|
|
|
+ Admin use = adminMapper.selectByPrimaryKey(ad.getId());
|
|
|
+ AmbSystem ambSystem = ambSystemMapper.selectByPrimaryKey(Long.valueOf(ad.getAmbId()));
|
|
|
+ if (ambSystem.getLvl() == 5 || ambSystem.getLvl() == 6) {
|
|
|
+ if (use.getAmbRole() == null) {
|
|
|
+ ad.setAmbRole("7");
|
|
|
+ } else {
|
|
|
+ if (!use.getAmbRole().contains("7")) {
|
|
|
+ ad.setAmbRole(use.getAmbRole() + ",7");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|