|
@@ -208,7 +208,9 @@ public class PerfRankMgmtSaveValidate extends AbstractValidator {
|
|
|
|
|
|
|
|
for (int i = 0; i < entries.size(); i++) {
|
|
for (int i = 0; i < entries.size(); i++) {
|
|
|
DynamicObject entry = entries.get(i);
|
|
DynamicObject entry = entries.get(i);
|
|
|
- validateEntry(entry, rowDataEntity, i + 1, personIds, context);
|
|
|
|
|
|
|
+ if(entry.getBoolean(PerfRankMgmtConstant.NCKD_ISRANKING)) {
|
|
|
|
|
+ validateEntry(entry, rowDataEntity, i + 1, personIds, context);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
context.personIds = personIds;
|
|
context.personIds = personIds;
|
|
|
|
|
|
|
@@ -260,10 +262,12 @@ public class PerfRankMgmtSaveValidate extends AbstractValidator {
|
|
|
));
|
|
));
|
|
|
// StringJoiner msgJoiner = new StringJoiner(StrFormatter.LINE_SEPARATOR);
|
|
// StringJoiner msgJoiner = new StringJoiner(StrFormatter.LINE_SEPARATOR);
|
|
|
for (DynamicObject entry : entries) {
|
|
for (DynamicObject entry : entries) {
|
|
|
- long person = entry.getDynamicObject(PerfRankMgmtConstant.NCKD_PERSON).getLong(FormConstant.ID_KEY);
|
|
|
|
|
- if (!personMap.containsKey(person)) {
|
|
|
|
|
- String personName = entry.getDynamicObject(PerfRankMgmtConstant.NCKD_PERSON).getString(FormConstant.NAME_KEY);
|
|
|
|
|
- this.addFatalErrorMessage(rowDataEntity,StrFormatter.format("人员【{}】没有【{}】年度的考核周期;", personName,theYear));
|
|
|
|
|
|
|
+ if(entry.getBoolean(PerfRankMgmtConstant.NCKD_ISRANKING)) {
|
|
|
|
|
+ long person = entry.getDynamicObject(PerfRankMgmtConstant.NCKD_PERSON).getLong(FormConstant.ID_KEY);
|
|
|
|
|
+ if (!personMap.containsKey(person)) {
|
|
|
|
|
+ String personName = entry.getDynamicObject(PerfRankMgmtConstant.NCKD_PERSON).getString(FormConstant.NAME_KEY);
|
|
|
|
|
+ this.addFatalErrorMessage(rowDataEntity, StrFormatter.format("人员【{}】没有【{}】年度的考核周期;", personName, theYear));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
/*if(msgJoiner.length() > 0){
|
|
/*if(msgJoiner.length() > 0){
|