|
|
@@ -92,7 +92,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unused")
|
|
|
@Override
|
|
|
- public int updateByPrimaryKeySelective(Admin ad, List<String> roleIds,boolean updateName) {
|
|
|
+ public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("uid", ad.getId());
|
|
|
params.put("roles", roleIds);
|
|
|
@@ -107,8 +107,8 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
ad.setType(sumType(roleIds));
|
|
|
int count=adminMapper.updateByPrimaryKey(ad);
|
|
|
+ //
|
|
|
pushAmbRole(ad);
|
|
|
- pushAdminRole(ad,roleIds,useRole,updateName);
|
|
|
if (count>0&&ad.getAmbId()!=null){
|
|
|
//进行巴人数计算
|
|
|
// AmbSystem ambSystem = ambSystemMapper.selectByPrimaryKey(Long.valueOf(ad.getAmbId()));
|
|
|
@@ -124,79 +124,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
|
|
|
|
|
|
|
|
|
- private void pushAdminRole(Admin ad,List<String>roleIds, Set<String> useRole,boolean updateName) {
|
|
|
- Integer flag=0;
|
|
|
- String roleType="";
|
|
|
- //新的计算
|
|
|
- List<Role> roleList = roleMapper.selectByIdList(roleIds);
|
|
|
-
|
|
|
- //加入以前有也要重新计算
|
|
|
- if (useRole!=null){
|
|
|
- for (String s : useRole) {
|
|
|
- if (AFTConstants.SALESMAN_ADMIN.equals(s)){
|
|
|
- flag=1;
|
|
|
- roleType=AFTConstants.SALESMAN_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.COMPANY_MANAGER.equals(s)){
|
|
|
- flag=2;
|
|
|
- roleType=AFTConstants.COMPANY_MANAGER;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.FINANCE_ADMIN.equals(s)){
|
|
|
- flag=3;
|
|
|
- roleType=AFTConstants.FINANCE_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH_ADMIN.equals(s)){
|
|
|
- flag=4;
|
|
|
- roleType=AFTConstants.TECH_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH.equals(s)){
|
|
|
- flag=5;
|
|
|
- roleType=AFTConstants.TECH;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH_MANAGER.equals(s)){
|
|
|
- flag=6;
|
|
|
- roleType=AFTConstants.TECH_MANAGER;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (roleList!=null){
|
|
|
- for (Role role : roleList) {
|
|
|
- if (AFTConstants.SALESMAN_ADMIN.equals(role.getRoleType().toString())){
|
|
|
- flag=1;
|
|
|
- roleType=AFTConstants.SALESMAN_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.COMPANY_MANAGER.equals(role.getRoleType().toString())){
|
|
|
- flag=2;
|
|
|
- roleType=AFTConstants.COMPANY_MANAGER;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.FINANCE_ADMIN.equals(role.getRoleType().toString())){
|
|
|
- flag=3;
|
|
|
- roleType=AFTConstants.FINANCE_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH_ADMIN.equals(role.getRoleType().toString())){
|
|
|
- flag=4;
|
|
|
- roleType=AFTConstants.TECH_ADMIN;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH.equals(role.getRoleType().toString())){
|
|
|
- flag=5;
|
|
|
- roleType=AFTConstants.TECH;
|
|
|
- break;
|
|
|
- }else if (AFTConstants.TECH_MANAGER.equals(role.getRoleType().toString())){
|
|
|
- flag=6;
|
|
|
- roleType=AFTConstants.TECH_MANAGER;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if (flag!=0){
|
|
|
-
|
|
|
- asyncUtils.updateListExamineName(flag,ad.getId(),roleType);
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
private int sumType(List<String > roleIds) {
|
|
|
@@ -330,18 +258,10 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
if(ad.getAmbId()!=null)pushAmbRole(ad);
|
|
|
adminMapper.insert(ad);
|
|
|
- pushAdminRole(ad,roleIds);
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 新增无需判断权限与名称
|
|
|
- * @param ad
|
|
|
- * @param roleIds
|
|
|
- */
|
|
|
- private void pushAdminRole(Admin ad,List<String>roleIds){
|
|
|
- pushAdminRole(ad,roleIds,null,false);
|
|
|
- }
|
|
|
|
|
|
|
|
|
/**
|