diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 57af35b3..a279368a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -199,8 +199,11 @@ public class ActSarItemsEOService { List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType()); if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); + sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setCountry("CN"); } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { + + sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); } //此处判断是否是带入的标准 @@ -1109,6 +1112,7 @@ public class ActSarItemsEOService { case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break; case "standState": sarStandardsInfoEO.setStandState(valueStr); break; case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break; + case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break; case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break; case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break; case "fileWord": diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index cde2968f..ac30740c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity { private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID + + @TableField(exist = false) + private String menuIds; //目录ID @TableField(exist = false) private int upReplaceNumFlag; //记录是否修改了替代文件号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 244fa967..55c15c85 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl