Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, BUG #56065

See merge request LiuChao/foton-slrs-system-rest!539
This commit is contained in:
super_liu
2022-06-24 18:30:21 +08:00
@@ -35,6 +35,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
@@ -48,6 +50,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
@@ -1564,6 +1567,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (value1 != null && value1.toString().equals("\"null\"")){
entry.setValue("");
}
if("TXLBBUSS".equals(name)){
String value = entry.getValue().toString();
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa");
List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper);
if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId());
}
}
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
String value = entry.getValue().toString();
String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name);