Commit 12af57f8 authored by fangxinjiang's avatar fangxinjiang

项目规则配置-fxj

parent f653e429
......@@ -403,6 +403,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//数据库中查询的字典 页面已经改了 不在作为重复结果集
for (SysAutoDictItem item:oldAutoDictItems){
for (SysAutoDictItem item1:autoDictItems){
if (Common.isNotNull(item1.getId()) && CommonConstants.ONE_STRING.equals(item1.getDisable())){
repeatItems.remove(item1.getLabel());
}
if (Common.isNotNull(item1.getId())
&& item.getId().equals(item1.getId())
&& !item1.getLabel().equals(item.getLabel())){
......@@ -480,7 +483,9 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
}
for (SysAutoDictItem item : autoDictItems) {
if (Common.isEmpty(item) || Common.isEmpty(item.getLabel())) {
if (Common.isEmpty(item)
|| Common.isEmpty(item.getLabel())
|| CommonConstants.ONE_STRING.equals(item.getDisable())) {
continue; // 跳过无效的 item
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment