|
|
@@ -470,32 +470,35 @@ public class AsyncUtils {
|
|
|
}
|
|
|
boolean newDEP=Rolescontains(roles,roleType);
|
|
|
boolean useDep=Rolescontains(useRole,roleType);
|
|
|
- if (roleType.equals(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- if (ad.getDepartmentId().equals(usead.getDepartmentId())){
|
|
|
- updatedep=1;
|
|
|
- }else{
|
|
|
- updatedep=2;
|
|
|
- }
|
|
|
- if (newDEP&&useDep){
|
|
|
- //新旧为同一个,修改当前就可以了
|
|
|
- if (updatedep ==1&& updateParam){
|
|
|
- updateOrderAndChangeExamine(ad, roleType);
|
|
|
- //新旧不是同一个,俩个都要修改
|
|
|
- }else if (updatedep ==2){
|
|
|
+ if (newDEP||useDep){
|
|
|
+ if (roleType.equals(AFTConstants.SALESMAN_ADMIN)){
|
|
|
+ if (ad.getDepartmentId().equals(usead.getDepartmentId())){
|
|
|
+ updatedep=1;
|
|
|
+ }else{
|
|
|
+ updatedep=2;
|
|
|
+ }
|
|
|
+ if (newDEP&&useDep){
|
|
|
+ //新旧为同一个,修改当前就可以了
|
|
|
+ if (updatedep ==1&& updateParam){
|
|
|
+ updateOrderAndChangeExamine(ad, roleType);
|
|
|
+ //新旧不是同一个,俩个都要修改
|
|
|
+ }else if (updatedep ==2){
|
|
|
+ updateOrderAndChangeExamine(ad, roleType);
|
|
|
+ updateOrderAndChangeExamine(usead, roleType);
|
|
|
+ }
|
|
|
+ }else if (newDEP&&!useDep){
|
|
|
updateOrderAndChangeExamine(ad, roleType);
|
|
|
+ }else if (!newDEP&&useDep){
|
|
|
updateOrderAndChangeExamine(usead, roleType);
|
|
|
}
|
|
|
- }else if (newDEP&&!useDep){
|
|
|
- updateOrderAndChangeExamine(ad, roleType);
|
|
|
- }else if (!newDEP&&useDep){
|
|
|
- updateOrderAndChangeExamine(usead, roleType);
|
|
|
- }
|
|
|
- }else {
|
|
|
- if (updateParam){
|
|
|
- updateOrderAndChangeExamine(ad, roleType);
|
|
|
+ }else {
|
|
|
+ if (updateParam){
|
|
|
+ updateOrderAndChangeExamine(ad, roleType);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|