diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 99380060..f4278876 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -245,6 +245,9 @@ public class SarBussionessStand extends BaseEntity { private String issueTimeEnd; @TableField(exist = false) private String prcCreateUser; + //体系类别ID + @TableField(exist = false) + private String txlbId; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 369af477..c54094ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -623,10 +623,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); - if(sarStandAttrMap.containsKey("TXLBBUSS") && StringUtils.isNotBlank(sarStandAttrMap.get("TXLBBUSS"))){ + if(StringUtils.isNotBlank(sarBussionessStandEO.getTxlbId())){ + SarMenuStandard sarMenuStandard = iSarMenuStandardService.selectMenuById(sarBussionessStandEO.getTxlbId()); + if(sarMenuStandard!=null ){ QueryWrapper menuQueryWrapper = new QueryWrapper<>(); menuQueryWrapper.eq("BUSS_STAND_ID",sarBussionessStandEO.getId()); // menuQueryWrapper.eq("MENU_ID",sarStandAttrMap.get("TXLBBUSS")); @@ -637,7 +636,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl delIds = new ArrayList<>(); for(SarBussStandMenu m: sarBussStandMenus){ - if(StringUtils.equals(m.getMenuId(),sarStandAttrMap.get("TXLBBUSS"))){ + if(StringUtils.equals(m.getMenuId(),sarBussionessStandEO.getTxlbId())){ upFlag= false; }else{ delIds.add(m.getId()); @@ -645,7 +644,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); +// //此处有BUG,因为前端传的参数中只有名称,没有ID,导致此处数据保存的时候直接保存了名字而不是ID,从而查不出来的BUG +// if(sarStandAttrMap.containsKey("TXLBBUSS") && StringUtils.isNotBlank(sarStandAttrMap.get("TXLBBUSS"))){ +// QueryWrapper menuQueryWrapper = new QueryWrapper<>(); +// menuQueryWrapper.eq("BUSS_STAND_ID",sarBussionessStandEO.getId()); +//// menuQueryWrapper.eq("MENU_ID",sarStandAttrMap.get("TXLBBUSS")); +// menuQueryWrapper.eq("VALID_FLAG",0); +// menuQueryWrapper.eq("TREE_TYPE","sarMs"); +// List sarBussStandMenus = sarBussStandMenuEODao.selectList(menuQueryWrapper); +// if(sarBussStandMenus !=null && !sarBussStandMenus.isEmpty()){ +// boolean upFlag = true; +// List delIds = new ArrayList<>(); +// for(SarBussStandMenu m: sarBussStandMenus){ +// if(StringUtils.equals(m.getMenuId(),sarStandAttrMap.get("TXLBBUSS"))){ +// upFlag= false; +// }else{ +// delIds.add(m.getId()); +// } +// } +// if(upFlag){ +// SarBussStandMenu jsMenu = new SarBussStandMenu(); +// jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS")); +// jsMenu.setValidFlag(0); +// jsMenu.setTreeType("sarMs"); +// jsMenu.setBussStandId(sarBussionessStandEO.getId()); +// jsMenu.setId(UUIDUtils.randomUUID(32)); +// sarBussStandMenuEODao.insert(jsMenu); +// } +// if(!delIds.isEmpty()){ +// sarBussStandMenuEODao.deleteBatchIds(delIds); +// } +// }else{ +// SarBussStandMenu jsMenu = new SarBussStandMenu(); +// jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS")); +// jsMenu.setValidFlag(0); +// jsMenu.setTreeType("sarMs"); +// jsMenu.setBussStandId(sarBussionessStandEO.getId()); +// jsMenu.setId(UUIDUtils.randomUUID(32)); +// sarBussStandMenuEODao.insert(jsMenu); +// } +// } +// } //修改收藏分享编号名称 updateCollectAndShare(sarBussionessStandEO);