会员
This commit is contained in:
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.http.HtmlUtil;
|
||||
import io.v.nutz.base.utils.ManyAddOrRenewUtil;
|
||||
import io.v.nutz.base.utils.Roles;
|
||||
@@ -534,6 +535,13 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
|
||||
if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
|
||||
if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);
|
||||
}
|
||||
if (Lang.isEmpty(changeList)) {
|
||||
@@ -582,6 +590,12 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
|
||||
if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
|
||||
if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);
|
||||
}
|
||||
if (Lang.isEmpty(changeList)) {
|
||||
|
||||
Reference in New Issue
Block a user