|
@@ -662,7 +662,7 @@ public class AnnualAdjustmentService {
|
|
|
newjobgradeindex = maxJobGradeIndex;
|
|
newjobgradeindex = maxJobGradeIndex;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if((ac.data.getZgjbId() == null || ac.data.getZyjndjId() == 0) && (ac.data.getZyjndjId() == null || ac.data.getZyjndjId() == 0)) {
|
|
|
|
|
|
|
+ if((ac.data.getZgjbId() == null || ac.data.getZgjbId() == 0) && (ac.data.getZyjndjId() == null || ac.data.getZyjndjId() == 0)) {
|
|
|
//如果没有聘任则取最低职级
|
|
//如果没有聘任则取最低职级
|
|
|
jobLevel = JobLevelCalculatorService.getLowestJobLevel(ac.convertJobSeq);
|
|
jobLevel = JobLevelCalculatorService.getLowestJobLevel(ac.convertJobSeq);
|
|
|
if(jobLevel != null) {
|
|
if(jobLevel != null) {
|
|
@@ -679,7 +679,7 @@ public class AnnualAdjustmentService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- if((ac.data.getZgjbId() == null || ac.data.getZyjndjId() == 0) && (ac.data.getZyjndjId() == null || ac.data.getZyjndjId() == 0)) {
|
|
|
|
|
|
|
+ if((ac.data.getZgjbId() == null || ac.data.getZgjbId() == 0) && (ac.data.getZyjndjId() == null || ac.data.getZyjndjId() == 0)) {
|
|
|
//无聘任
|
|
//无聘任
|
|
|
ac.adjustType = "7";
|
|
ac.adjustType = "7";
|
|
|
}else if (newjobgradeindex == ac.data.getLastJobGradeIndex()) {
|
|
}else if (newjobgradeindex == ac.data.getLastJobGradeIndex()) {
|