Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 企标编辑优化

See merge request LiuChao/foton-slrs-system-rest!541
This commit is contained in:
super_liu
2022-06-28 11:48:12 +08:00
@@ -1568,6 +1568,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
entry.setValue(""); entry.setValue("");
} }
if("TXLBBUSS".equals(name)){ if("TXLBBUSS".equals(name)){
if(value1 != null){
String value = entry.getValue().toString(); String value = entry.getValue().toString();
QueryWrapper wrapper = new QueryWrapper(); QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim()); wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
@@ -1576,7 +1577,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if(!list.isEmpty()){ if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId()); newMap.put(name+"MenuId",list.get(0).getId());
} }
}
} }
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
String value = entry.getValue().toString(); String value = entry.getValue().toString();