feat: 企业标准库 迁移1

adc-da-slrs/src/main/java/com/adc/da/slrs/SarBussStandItemVal/controller/SarBussStandItemValController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.SarBussStandItemVal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.SarBussStandItemVal.entity.SarBussStandItemVal;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 企业标准条目关联表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(description = "|SarBussStandItemVal|")
+@RequestMapping("/SarBussStandItemVal/sar-buss-stand-item-val")
+public class SarBussStandItemValController extends BaseController<SarBussStandItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarBussStandItemVal/dao/SarBussStandItemValDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.SarBussStandItemVal.dao;
+
+import com.adc.da.slrs.SarBussStandItemVal.entity.SarBussStandItemVal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业标准条目关联表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface SarBussStandItemValDao extends BaseMapper<SarBussStandItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarBussStandItemVal/entity/SarBussStandItemVal.java

@@ -0,0 +1,59 @@
+package com.adc.da.slrs.SarBussStandItemVal.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业标准条目关联表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandItemVal对象", description="企业标准条目关联表")
+public class SarBussStandItemVal extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "企业标准条目ID")
+    @TableField("ITEM_ID")
+    private String itemId;
+
+    @ApiModelProperty(value = "参数类型")
+    @TableField("PROPERTY_TYPE")
+    private String propertyType;
+
+    @ApiModelProperty(value = "参数值")
+    @TableField("PROPERTY_VALUE")
+    private String propertyValue;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private BigDecimal validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarBussStandItemVal/service/ISarBussStandItemValService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.SarBussStandItemVal.service;
+
+import com.adc.da.slrs.SarBussStandItemVal.entity.SarBussStandItemVal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业标准条目关联表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandItemValService extends IService<SarBussStandItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarBussStandItemVal/service/impl/SarBussStandItemValServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.SarBussStandItemVal.service.impl;
+
+import com.adc.da.slrs.SarBussStandItemVal.entity.SarBussStandItemVal;
+import com.adc.da.slrs.SarBussStandItemVal.dao.SarBussStandItemValDao;
+import com.adc.da.slrs.SarBussStandItemVal.service.ISarBussStandItemValService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业标准条目关联表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandItemValServiceImpl extends ServiceImpl<SarBussStandItemValDao, SarBussStandItemVal> implements ISarBussStandItemValService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarBussStandFile.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 企业标准文件详情表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(description = "|SarBussStandFile|")
+@RequestMapping("/sarBussStandFile/sar-buss-stand-file")
+public class SarBussStandFileController extends BaseController<SarBussStandFile> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandFile.dao;
+
+import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业标准文件详情表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface SarBussStandFileDao extends BaseMapper<SarBussStandFile> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java

@@ -0,0 +1,80 @@
+package com.adc.da.slrs.sarBussStandFile.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业标准文件详情表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandFile对象", description="企业标准文件详情表")
+public class SarBussStandFile extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableField("ID")
+    private String id;
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "标准文件分类")
+    @TableField("STAND_FILE_CLASSIFY")
+    private String standFileClassify;
+
+    @ApiModelProperty(value = "文件主键")
+    @TableField("ATT_ID")
+    private String attId;
+
+    @ApiModelProperty(value = "文件名称")
+    @TableField("FILE_NAME")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件后缀")
+    @TableField("FILE_SUFFIX")
+    private String fileSuffix;
+
+    @ApiModelProperty(value = "使用模式（SOURCE_FILE原文件，WEB_FILE转换后文件）")
+    @TableField("USE_MODEL")
+    private String useModel;
+
+    @ApiModelProperty(value = "加密密码")
+    @TableField("PASSWORD")
+    private String password;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private String validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+    @ApiModelProperty(value = "转换原文件id")
+    @TableField("ORI_ATT_ID")
+    private String oriAttId;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandFile.service;
+
+import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业标准文件详情表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandFileService extends IService<SarBussStandFile> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarBussStandFile.service.impl;
+
+import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
+import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
+import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业标准文件详情表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandFileServiceImpl extends ServiceImpl<SarBussStandFileDao, SarBussStandFile> implements ISarBussStandFileService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/controller/SarBussStandItemsController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarBussStandItems.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 企业标准条目信息表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(description = "|SarBussStandItems|")
+@RequestMapping("/sarBussStandItems/sar-buss-stand-items")
+public class SarBussStandItemsController extends BaseController<SarBussStandItems> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/dao/SarBussStandItemsDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandItems.dao;
+
+import com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业标准条目信息表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface SarBussStandItemsDao extends BaseMapper<SarBussStandItems> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/entity/SarBussStandItems.java

@@ -0,0 +1,119 @@
+package com.adc.da.slrs.sarBussStandItems.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业标准条目信息表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandItems对象", description="企业标准条目信息表")
+public class SarBussStandItems extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "条目号")
+    @TableField("ITEMS_NUM")
+    private String itemsNum;
+
+    @ApiModelProperty(value = "条目内容")
+    @TableField("ITEMS_NAME")
+    private String itemsName;
+
+    @ApiModelProperty(value = "涉及零部件")
+    @TableField("PARTS")
+    private String parts;
+
+    @ApiModelProperty(value = "特殊生效时间")
+    @TableField("TACK_TIME")
+    private LocalDateTime tackTime;
+
+    @ApiModelProperty(value = "适用车型")
+    @TableField("APPLY_ARCTIC")
+    private String applyArctic;
+
+    @ApiModelProperty(value = "能源类型")
+    @TableField("ENERGY_KIND")
+    private String energyKind;
+
+    @ApiModelProperty(value = "责任部门")
+    @TableField("RESPONSIBLE_UNIT")
+    private String responsibleUnit;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARKS")
+    private String remarks;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private BigDecimal validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+    @ApiModelProperty(value = "实施要点")
+    @TableField("MAINPOINTS_IMPEMENTATION")
+    private String mainpointsImpementation;
+
+    @ApiModelProperty(value = "条款要求")
+    @TableField("TERMS_CONDITIONS")
+    private String termsConditions;
+
+    @ApiModelProperty(value = "适用认证")
+    @TableField("APPLY_AUTH")
+    private String applyAuth;
+
+    @ApiModelProperty(value = "FO")
+    @TableField("FO")
+    private String fo;
+
+    @ApiModelProperty(value = "责任工程师")
+    @TableField("DUTY_ENGINEER")
+    private String dutyEngineer;
+
+    @ApiModelProperty(value = "SVPPS")
+    @TableField("SVPPS")
+    private String svpps;
+
+    @ApiModelProperty(value = "要求类型")
+    @TableField("CLAIM_TYPE")
+    private String claimType;
+
+    @ApiModelProperty(value = "企标覆盖关系")
+    @TableField("BUS_STAND_COVER")
+    private String busStandCover;
+
+    @ApiModelProperty(value = "FILE_TYPE")
+    @TableField("FILE_TYPE")
+    private String fileType;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/service/ISarBussStandItemsService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandItems.service;
+
+import com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业标准条目信息表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandItemsService extends IService<SarBussStandItems> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/service/impl/SarBussStandItemsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarBussStandItems.service.impl;
+
+import com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems;
+import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao;
+import com.adc.da.slrs.sarBussStandItems.service.ISarBussStandItemsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业标准条目信息表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandItemsServiceImpl extends ServiceImpl<SarBussStandItemsDao, SarBussStandItems> implements ISarBussStandItemsService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/controller/SarBussStandMenuController.java

@@ -0,0 +1,81 @@
+package com.adc.da.slrs.sarBussStandMenu.controller;
+
+
+import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
+import com.adc.da.slrs.sarResource.entity.TsResource;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 企业标准目录关联表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(tags = "福田标准法规--企业标准目录关联表")
+@RequestMapping("/${restPath}/lawss/sarBussStandMenu")
+public class SarBussStandMenuController extends BaseController<SarBussStandMenu> {
+
+    @Autowired
+    private ISarBussStandMenuService sarBussStandMenuEOService;
+
+    @Autowired
+    private ITsResourceService sarMenuEOService;
+
+    @ApiOperation(value = "|SarBussStandMenuEO|修改")
+    @PutMapping("/removeStandInfo")
+//    @RequiresPermissions("lawss:sarStandMenu:update")
+    public ResponseMessage removeStandInfo(@RequestBody SarBussStandMenu standardsInfoEO) throws Exception {
+        String[] idList = standardsInfoEO.getIdlist();
+        int count = 0;
+        if(idList != null){
+            for(String id : idList){
+                SarBussStandMenu menuEO = new SarBussStandMenu();
+                menuEO.setBussStandId(id);
+                menuEO.setMenuId(standardsInfoEO.getMenuId());
+                //删除所选目录下关联
+                String oldMenuId = standardsInfoEO.getOldMenuId();
+                if (StringUtils.isEmpty(oldMenuId)) {
+                    oldMenuId = standardsInfoEO.getMenuId();
+                }
+                menuEO.setOldMenuId(oldMenuId);
+                count += sarBussStandMenuEOService.deleteByMenuId(menuEO);
+                //查询是否还有与其他节点的关联，若没有则增加与根节点的关联
+                List<SarBussStandMenu> getList = sarBussStandMenuEOService.selectAllMenuByStandId(menuEO);
+                if (getList == null || getList.isEmpty()) {
+                    // 查询根节点
+                    TsResource sarMenuEO = new TsResource();
+                    sarMenuEO.setSorDivide("BUSINESS_STAND");
+                    List<TsResource> getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO);
+                    menuEO.setMenuId(getRootMenu.get(0).getId());
+                    menuEO.setId(UUIDUtils.randomUUID20());
+                    menuEO.setValidFlag(0);
+                    sarBussStandMenuEOService.save(menuEO);
+                }
+            }
+        }
+        if(count>0){
+            return Result.success("0","移除成功！",true);
+        } else {
+            return Result.error("移除失败!");
+        }
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java

@@ -0,0 +1,34 @@
+package com.adc.da.slrs.sarBussStandMenu.dao;
+
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准目录关联表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Repository
+public interface SarBussStandMenuDao extends BaseMapper<SarBussStandMenu> {
+
+    List<SarBussStandMenu> selectByMenuId(SarBussStandMenu sarStandMenuEO);
+
+    int deleteByStandId(String bussStandId);
+
+    List<SarBussStandMenu> selectMenuByMenuParentId(SarBussStandMenu sarStandMenuEO);
+
+    int updateByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO);
+
+    List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO);
+
+    int deleteByMenuId (SarBussStandMenu sarStandMenuEO);
+
+    int deleteByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/entity/NewmenuOldmenuVO.java

@@ -0,0 +1,14 @@
+package com.adc.da.slrs.sarBussStandMenu.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * Created by Administrator on 2018/9/13 19:29
+ */
+@Data
+public class NewmenuOldmenuVO extends BaseEntity {
+
+    private String oldMenuid;
+    private String newMenuid;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/entity/SarBussStandMenu.java

@@ -0,0 +1,56 @@
+package com.adc.da.slrs.sarBussStandMenu.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准目录关联表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandMenu对象", description="企业标准目录关联表")
+public class SarBussStandMenu extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "企业标准ID")
+    @TableField("BUSS_STAND_ID")
+    private String bussStandId;
+
+    @ApiModelProperty(value = "目录ID")
+    @TableField("MENU_ID")
+    private String menuId;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @TableField(exist = false)
+    private String oldMenuId;
+
+    @TableField(exist = false)
+    private String[] idlist;
+
+    @TableField(exist = false)
+    private List<String> menuIds;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java

@@ -0,0 +1,21 @@
+package com.adc.da.slrs.sarBussStandMenu.service;
+
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准目录关联表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandMenuService extends IService<SarBussStandMenu> {
+
+    List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO);
+
+    int deleteByMenuId (SarBussStandMenu sarStandMenuEO);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java

@@ -0,0 +1,37 @@
+package com.adc.da.slrs.sarBussStandMenu.service.impl;
+
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
+import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准目录关联表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandMenuServiceImpl extends ServiceImpl<SarBussStandMenuDao, SarBussStandMenu> implements ISarBussStandMenuService {
+
+    @Autowired
+    private ITsResourceService sarMenuEOService;
+
+    public int deleteByMenuId (SarBussStandMenu sarStandMenuEO){
+        List<String> menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId());
+        sarStandMenuEO.setMenuIds(menuIds);
+        return this.baseMapper.deleteByMenuId(sarStandMenuEO);
+    }
+
+    @Override
+    public List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){
+        return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarBussStandPlan.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandPlan.entity.SarBussStandPlan;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(description = "|SarBussStandPlan|")
+@RequestMapping("/sarBussStandPlan/sar-buss-stand-plan")
+public class SarBussStandPlanController extends BaseController<SarBussStandPlan> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/dao/SarBussStandPlanDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandPlan.dao;
+
+import com.adc.da.slrs.sarBussStandPlan.entity.SarBussStandPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface SarBussStandPlanDao extends BaseMapper<SarBussStandPlan> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/entity/SarBussStandPlan.java

@@ -0,0 +1,186 @@
+package com.adc.da.slrs.sarBussStandPlan.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandPlan对象", description="")
+public class SarBussStandPlan extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_CODE")
+    private String standCode;
+
+    @ApiModelProperty(value = "被代替标准编号")
+    @TableField("REPLACED_STAND_NUM")
+    private String replacedStandNum;
+
+    @ApiModelProperty(value = "计划类型")
+    @TableField("PLAN_TYPE")
+    private String planType;
+
+    @ApiModelProperty(value = "中文名称")
+    @TableField("CN_NAME")
+    private String cnName;
+
+    @ApiModelProperty(value = "英文名称")
+    @TableField("EN_NAME")
+    private String enName;
+
+    @ApiModelProperty(value = "标准类别")
+    @TableField("STAND_SORT")
+    private String standSort;
+
+    @ApiModelProperty(value = "计划开始时间")
+    @TableField("PLAN_START_TIME")
+    private LocalDateTime planStartTime;
+
+    @ApiModelProperty(value = "计划结束时间")
+    @TableField("PLAN_END_TIME")
+    private LocalDateTime planEndTime;
+
+    @ApiModelProperty(value = "标准起草组组员")
+    @TableField("COMPILERS_USER")
+    private String compilersUser;
+
+    @ApiModelProperty(value = "标准密级")
+    @TableField("STAND_LEVEL")
+    private String standLevel;
+
+    @ApiModelProperty(value = "计划发布日期")
+    @TableField("PUT_TIME")
+    private LocalDateTime putTime;
+
+    @ApiModelProperty(value = "涉及的会签部门")
+    @TableField("COMPILE_UNIT")
+    private String compileUnit;
+
+    @ApiModelProperty(value = "标准制修订来源")
+    @TableField("PLAN_SOURCE")
+    private String planSource;
+
+    @ApiModelProperty(value = "制修订原因")
+    @TableField("PLAN_REASON")
+    private String planReason;
+
+    @ApiModelProperty(value = "验证工作")
+    @TableField("TEST_WORK")
+    private String testWork;
+
+    @ApiModelProperty(value = "项目影响")
+    @TableField("PLAN_IMPACT")
+    private String planImpact;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+    @ApiModelProperty(value = "删除标识")
+    @TableField("VALID_FLAG")
+    private BigDecimal validFlag;
+
+    @ApiModelProperty(value = "制修订原因附件")
+    @TableField("PLAN_REASON_FILE")
+    private String planReasonFile;
+
+    @ApiModelProperty(value = "验证工作附件 ")
+    @TableField("TEST_WORK_FILE")
+    private String testWorkFile;
+
+    @ApiModelProperty(value = "项目影响附件")
+    @TableField("PLAN_IMPACT_FILE")
+    private String planImpactFile;
+
+    @ApiModelProperty(value = "计划状态")
+    @TableField("PLAN_STATUS")
+    private String planStatus;
+
+    @TableField("DRAFT_USER")
+    private String draftUser;
+
+    @ApiModelProperty(value = "起草单位")
+    @TableField("DRAFTING_UNIT")
+    private String draftingUnit;
+
+    @ApiModelProperty(value = "实际结束时间")
+    @TableField("ACTUAL_END_TIME")
+    private LocalDateTime actualEndTime;
+
+    @ApiModelProperty(value = "签字确认文件")
+    @TableField("SIGN_CONFIRM_FILE")
+    private String signConfirmFile;
+
+    @ApiModelProperty(value = "修订企标")
+    @TableField("REVISE_BUSS_STAND")
+    private String reviseBussStand;
+
+    @ApiModelProperty(value = "起草分标委")
+    @TableField("DRAFT_COMMITTEE")
+    private String draftCommittee;
+
+    @ApiModelProperty(value = "主要起草人ID")
+    @TableField("PRIMARY_DRAFTER")
+    private String primaryDrafter;
+
+    @ApiModelProperty(value = "主起草人名称")
+    @TableField("PRIMARY_DRAFTER_NAME")
+    private String primaryDrafterName;
+
+    @ApiModelProperty(value = "主起草部门ID")
+    @TableField("PRIMARY_DRAFTER_DEPT")
+    private String primaryDrafterDept;
+
+    @ApiModelProperty(value = "主起草部门名称")
+    @TableField("PRIMARY_DRAFTER_DEPT_NAME")
+    private String primaryDrafterDeptName;
+
+    @ApiModelProperty(value = "其他起草部门ID 逗号拼接")
+    @TableField("OTHER_DRAFTER_DEPT")
+    private String otherDrafterDept;
+
+    @ApiModelProperty(value = "其他起草部门名称 逗号拼接")
+    @TableField("OTHER_DRAFTER_DEPT_NAME")
+    private String otherDrafterDeptName;
+
+    @ApiModelProperty(value = "相关流程")
+    @TableField("PRC_NUM")
+    private String prcNum;
+
+    @ApiModelProperty(value = "分类编号id")
+    @TableField("CLASS_CODE")
+    private String classCode;
+
+    @ApiModelProperty(value = "分类号大类编号id")
+    @TableField("QB_CODE")
+    private String qbCode;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/service/ISarBussStandPlanService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandPlan.service;
+
+import com.adc.da.slrs.sarBussStandPlan.entity.SarBussStandPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandPlanService extends IService<SarBussStandPlan> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/service/impl/SarBussStandPlanServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarBussStandPlan.service.impl;
+
+import com.adc.da.slrs.sarBussStandPlan.entity.SarBussStandPlan;
+import com.adc.da.slrs.sarBussStandPlan.dao.SarBussStandPlanDao;
+import com.adc.da.slrs.sarBussStandPlan.service.ISarBussStandPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandPlanServiceImpl extends ServiceImpl<SarBussStandPlanDao, SarBussStandPlan> implements ISarBussStandPlanService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/controller/SarBussStandValController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarBussStandVal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 企业标准关联表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-07-25
+*/
+@RestController
+@Api(description = "|SarBussStandVal|")
+@RequestMapping("/sarBussStandVal/sar-buss-stand-val")
+public class SarBussStandValController extends BaseController<SarBussStandVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandVal.dao;
+
+import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业标准关联表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface SarBussStandValDao extends BaseMapper<SarBussStandVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java

@@ -0,0 +1,52 @@
+package com.adc.da.slrs.sarBussStandVal.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业标准关联表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussStandVal对象", description="企业标准关联表")
+public class SarBussStandVal extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("STAND_ID")
+    private String standId;
+
+    @TableField("PROPERTY_TYPE")
+    private String propertyType;
+
+    @TableField("PROPERTY_VALUE")
+    private String propertyValue;
+
+    @TableField("VALID_FLAG")
+    private BigDecimal validFlag;
+
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/service/ISarBussStandValService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarBussStandVal.service;
+
+import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业标准关联表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+public interface ISarBussStandValService extends IService<SarBussStandVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/service/impl/SarBussStandValServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarBussStandVal.service.impl;
+
+import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
+import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
+import com.adc.da.slrs.sarBussStandVal.service.ISarBussStandValService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业标准关联表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-25
+ */
+@Service
+public class SarBussStandValServiceImpl extends ServiceImpl<SarBussStandValDao, SarBussStandVal> implements ISarBussStandValService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -2,9 +2,11 @@ package com.adc.da.slrs.sarBussionessStand.controller;
 
 
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
+import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sys.util.LoginUserUtil;
 import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
@@ -12,13 +14,12 @@ import com.adc.da.http.Result;
 import com.adc.da.util.utils.StringUtils;
 import com.adc.da.utils.util.SarAdvanceSearchUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -42,12 +43,30 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @Autowired
     private ITsResourceService iTsResourceService;
 
+    @Autowired
+    private ITsUserService tsUserService;
+
+    /**
+     * 给指定标准配置目录
+     * @param standardsInfoEO
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandEO|确认配置标准")
+    @PostMapping("/saveStandardsMenu")
+    //@RequiresPermissions("lawss:sarBussionessStand:saveStandardsMenu")
+    public ResponseMessage saveStandardsMenu(@RequestBody SarBussionessStandEOPage standardsInfoEO) throws Exception {
+        if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) {
+            return Result.error("所选节点不支持配置标准");
+        } else {
+            SarBussionessStandEOPage standlist = sarBussionessStandEOService.updateStandardsMenu(standardsInfoEO);
+            return Result.success(standardsInfoEO);
+        }
+    }
+
     /**
      * 自定义分页查询列表
      * @param page  标准信息
      * @return
-     * @author gaoyan
-     * date 2018-09-04
      */
     @ApiOperation(value = "|SarBussionessStandEO|自定义分页查询列表")
     @GetMapping("/getSarBussionStandPage")
@@ -67,16 +86,53 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
             String sql = page.getPaixu()+" "+page.getShunxu();
             page.setSql(sql);
         }else{
-            page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
+            page.setOrderBy("SAR_BUSSIONESS_STAND.MODIFY_TIME DESC");
         }
-        List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
-        if(getMenuIdList != null && !getMenuIdList.isEmpty()){
-            page.setMenuRoleList(getMenuIdList);
-            List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
-            return Result.success(getPageInfo(page.getPager(), rows));
-        } else {
-            return Result.success(getPageInfo(page.getPager(), null));
+        if(page.getMenuId() != null ){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(!children.isEmpty() || page.getMenuId().equals("nomenu")){
+                List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
+                return Result.success(getPageInfo(page.getPager(), rows));
+            }
+            List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
+            if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                page.setMenuRoleList(getMenuIdList);
+            } else {
+                page.setMenuRoleList(null);
+            }
+            List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+            if (ids != null && !ids.isEmpty()) {
+                page.setMenuAllChildrenIdList(ids);
+            }
         }
+        List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+//            String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
+//            if (StringUtils.isNotBlank(advanceStr)) {
+//                page.setAdvanceSearchStr(advanceStr);
+//            } else {
+//                page.setAdvanceSearchStr(null);
+//            }
+//        }
+//        page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time desc nulls last,SAR_BUSSIONESS_STAND.id");
+//        List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
+////        List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
+//        if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+//            page.setMenuRoleList(getMenuIdList);
+//        } else {
+//            page.setMenuRoleList(null);
+//        }
+//        List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+//        if (ids != null && !ids.isEmpty()) {
+//            page.setMenuAllChildrenIdList(ids);
+//        }
+//        List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
+//        return Result.success(getPageInfo(page.getPager(), rows));
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussStandMenuEO.java

@@ -0,0 +1,125 @@
+package com.adc.da.slrs.sarBussionessStand.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+
+import java.util.List;
+
+
+/**
+ * <b>功能：</b>SAR_BUSS_STAND_MENU SarBussStandMenuEOEntity<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2018-09-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarBussStandMenuEO extends BaseEntity {
+
+    private String menuId;
+    private String bussStandId;
+    private String id;
+    private Integer validFlag;
+    private String oldMenuId;
+    private String[] idlist;
+    private List<String> menuIds;
+
+    /**
+     * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>menuId -> menu_id</li>
+     * <li>bussStandId -> buss_stand_id</li>
+     * <li>id -> id</li>
+     * <li>validFlag -> valid_flag</li>
+     */
+    public static String fieldToColumn(String fieldName) {
+        if (fieldName == null){ return null;}
+        switch (fieldName) {
+            case "menuId": return "menu_id";
+            case "bussStandId": return "buss_stand_id";
+            case "id": return "id";
+            case "validFlag": return "valid_flag";
+            default: return null;
+        }
+    }
+
+    /**
+     * 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>menu_id -> menuId</li>
+     * <li>buss_stand_id -> bussStandId</li>
+     * <li>id -> id</li>
+     * <li>valid_flag -> validFlag</li>
+     */
+    public static String columnToField(String columnName) {
+        if (columnName == null){ return null;}
+        switch (columnName) {
+            case "menu_id": return "menuId";
+            case "buss_stand_id": return "bussStandId";
+            case "id": return "id";
+            case "valid_flag": return "validFlag";
+            default: return null;
+        }
+    }
+    
+    /**  **/
+    public String getMenuId() {
+        return this.menuId;
+    }
+
+    /**  **/
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    /**  **/
+    public String getBussStandId() {
+        return this.bussStandId;
+    }
+
+    /**  **/
+    public void setBussStandId(String bussStandId) {
+        this.bussStandId = bussStandId;
+    }
+
+    /**  **/
+    public String getId() {
+        return this.id;
+    }
+
+    /**  **/
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**  **/
+    public Integer getValidFlag() {
+        return this.validFlag;
+    }
+
+    /**  **/
+    public void setValidFlag(Integer validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getOldMenuId() {
+        return oldMenuId;
+    }
+
+    public void setOldMenuId(String oldMenuId) {
+        this.oldMenuId = oldMenuId;
+    }
+
+    public String[] getIdlist() {
+        return idlist;
+    }
+
+    public void setIdlist(String[] idlist) {
+        this.idlist = idlist;
+    }
+
+    public List<String> getMenuIds() {
+        return menuIds;
+    }
+
+    public void setMenuIds(List<String> menuIds) {
+        this.menuIds = menuIds;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {
 
+    SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO);
+
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
 
     List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -3,6 +3,9 @@ package com.adc.da.slrs.sarBussionessStand.service.impl;
 import com.adc.da.common.SelectionTypeEnum;
 import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
+import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussStandMenuEO;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
@@ -11,6 +14,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.FieldConvertUtil;
 import com.adc.da.utils.util.InitStandAttrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,32 +45,63 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private ITsResourceService iTsResourceService;
 
-
     @Autowired
     private SysInfoEOService sysInfoEOService;
 
+    @Autowired
+    private SarBussStandMenuDao sarBussStandMenuEODao;
+
     @Autowired
     private IPersonCollectEOService personCollectEOService;
 
     @Autowired
     private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
 
+    public SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO) {
+        SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();
+        String nowMenuId = standardsInfoEO.getMenuId();
+        sarStandMenuEO.setMenuId(nowMenuId);
+        for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
+            sarStandMenuEO.setBussStandId(standardsInfoEO.getIdlist()[i]);
+            sarStandMenuEO.setId(null);
+            sarStandMenuEO.setValidFlag(0);
+            // 根据当前目录查询所在父节点
+            String secondLevelId = "";
+            List<String> getMenuPIds = iTsResourceService.getParentMenuId(nowMenuId);
+            if (getMenuPIds != null && getMenuPIds.size() > 1) {
+                int idSize = getMenuPIds.size();
+                secondLevelId = getMenuPIds.get(idSize-1);
+            } else {
+                secondLevelId = nowMenuId;
+            }
+            //查询标准是否已在 当前父节点中
+            SarBussStandMenu standMenuEOQuery = new SarBussStandMenu();
+            standMenuEOQuery.setMenuId(secondLevelId);
+            standMenuEOQuery.setBussStandId(standardsInfoEO.getIdlist()[i]);
+            List<String> menuIds = iTsResourceService.getChildMenuList(secondLevelId);
+            standMenuEOQuery.setMenuIds(menuIds);
+            List<SarBussStandMenu> getInfo = sarBussStandMenuEODao.selectMenuByMenuParentId(standMenuEOQuery);
+            //删除节点与根节点的关联
+            SarBussStandMenu sarStandMenuDel = new SarBussStandMenu();
+            sarStandMenuDel.setBussStandId(standardsInfoEO.getIdlist()[i]);
+            sarStandMenuDel.setMenuId(standardsInfoEO.getRootMenuId());
+            sarBussStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
+            if (getInfo == null || getInfo.isEmpty()) {
+                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarBussStandMenuEODao.insert(sarStandMenuEO);
+            } else {
+                sarStandMenuEO.setOldMenuId(secondLevelId);
+                List<String> menuOldIds = iTsResourceService.getChildMenuList(secondLevelId);
+                sarStandMenuEO.setMenuIds(menuOldIds);
+                sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
+            }
+//            sarBussStandMenuEODao.updateByStandIDSelective(sarStandMenuEO);
+        }
+        return standardsInfoEO;
+    }
 
     @Override
     public List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
-        if (StringUtils.isNotBlank(page.getMenuId())) {
-            List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
-//        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
-            if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                page.setMenuRoleList(getMenuIdList);
-            } else {
-                page.setMenuRoleList(null);
-            }
-            List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
-            if (ids != null && !ids.isEmpty()) {
-                page.setMenuAllChildrenIdList(ids);
-            }
-        }
         Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
         page.getPager().setRowCount(rowCount);
         List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
@@ -81,7 +116,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
      */
     public void attrInfo (List<SarBussionessStand> sarlist) throws Exception {
         for(SarBussionessStand row : sarlist){
-            attrInfoDetails(row);
+            attrInfo1(row);
+        }
+    }
+
+    public void attrInfo1 (SarBussionessStand row) throws Exception {
+        String fieldInfo = InitStandAttrUtil.queryFieldBuss;
+        String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
+        row.setCollectId(collectId);
+        // 查询属性表数据
+        if (StringUtils.isNotBlank(fieldInfo)) {
+            Map<String, Object> getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId());
+            if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) {
+                // 遍历修改所有clob类型的值
+                for (String clobField : InitStandAttrUtil.clobFieldListBuss) {
+                    Clob clobValue = (Clob) getAttrMap.get(clobField);
+                    String fieldValue = FieldConvertUtil.ClobToString(clobValue);
+                    getAttrMap.put(clobField,fieldValue);
+                }
+            }
+            row.setAttrInfoMap(getAttrMap);
         }
     }
 

adc-da-slrs/src/main/resources/mybatis/mapper/SarBussStandItemVal/SarBussStandItemValMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.SarBussStandItemVal.dao.SarBussStandItemValDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao">
+    <!-- Result Map-->
+    <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        <id column="id" property="id" />
+        <result column="menu_id" property="menuId" />
+        <result column="buss_stand_id" property="bussStandId" />
+        <result column="valid_flag" property="validFlag" />
+    </resultMap>
+
+    <!-- SAR_BUSS_STAND_MENU table all fields -->
+    <sql id="Base_Column_List" >
+     menu_id, buss_stand_id, id, valid_flag
+  </sql>
+
+    <!-- 查询条件 -->
+    <sql id="Base_Where_Clause">
+        where 1=1
+        <trim suffixOverrides="," >
+            <if test="menuId != null" >
+                and menu_id = #{menuId}
+            </if>
+            <if test="bussStandId != null" >
+                and buss_stand_id = #{bussStandId}
+            </if>
+            <if test="id != null" >
+                and id = #{id}
+            </if>
+            <if test="validFlag != null" >
+                and valid_flag = #{validFlag}
+            </if>
+        </trim>
+    </sql>
+
+    <!-- 插入记录 -->
+    <insert id="insert" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            SELECT SEQ_SAR_BUSS_STAND_MENU.NEXTVAL FROM DUAL
+        </selectKey> -->
+        insert into SAR_BUSS_STAND_MENU(<include refid="Base_Column_List" />)
+        values (#{menuId, jdbcType=VARCHAR}, #{bussStandId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER})
+    </insert>
+
+    <!-- 动态插入记录 主键是序列 -->
+    <insert id="insertSelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_BUSS_STAND_MENU.NEXTVAL FROM DUAL
+    </selectKey> -->
+        insert into SAR_BUSS_STAND_MENU
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="menuId != null" >menu_id,</if>
+            <if test="bussStandId != null" >buss_stand_id,</if>
+            <if test="id != null" >id,</if>
+            <if test="validFlag != null" >valid_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="menuId != null" >#{menuId, jdbcType=VARCHAR},</if>
+            <if test="bussStandId != null" >#{bussStandId, jdbcType=VARCHAR},</if>
+            <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+            <if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
+        </trim>
+    </insert>
+
+    <!-- 根据pk，修改记录-->
+    <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+    update SAR_BUSS_STAND_MENU
+       set  menu_id = #{menuId},
+            buss_stand_id = #{bussStandId},
+            valid_flag = #{validFlag}
+     where  id = #{id}
+  </update>
+
+    <!-- 修改记录，只修改只不为空的字段 -->
+    <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        update SAR_BUSS_STAND_MENU
+        <set >
+            <if test="menuId != null" >
+                menu_id = #{menuId},
+            </if>
+            <if test="bussStandId != null" >
+                buss_stand_id = #{bussStandId},
+            </if>
+            <if test="validFlag != null" >
+                valid_flag = #{validFlag},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <update id="updateMenuidByMenuid" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.NewmenuOldmenuVO" >
+    update SAR_BUSS_STAND_MENU
+       set  menu_id = #{newMenuid}
+     where  menu_id = #{oldMenuid}
+  </update>
+
+    <update id="updateByStandIDSelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        update SAR_BUSS_STAND_MENU
+        <set >
+            <if test="menuId != null" >
+                menu_id = #{menuId},
+            </if>
+            <if test="validFlag != null" >
+                valid_flag = #{validFlag},
+            </if>
+        </set>
+        where  buss_stand_id = #{bussStandId}
+    </update>
+    <!-- 根据id查询 SAR_BUSS_STAND_MENU -->
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select <include refid="Base_Column_List" />
+        from SAR_BUSS_STAND_MENU
+        where id = #{value}
+
+    </select>
+
+    <!-- 删除记录 -->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from SAR_BUSS_STAND_MENU
+     where id = #{value}
+
+  </delete>
+
+    <!-- SAR_BUSS_STAND_MENU 列表总数-->
+    <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+        select count(1) from SAR_BUSS_STAND_MENU
+        <include refid="Base_Where_Clause"/>
+    </select>
+
+    <!-- 查询SAR_BUSS_STAND_MENU列表 -->
+    <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select <include refid="Base_Column_List" /> from
+        (select tmp_tb.* from
+        (select <include refid="Base_Column_List" /> from SAR_BUSS_STAND_MENU
+        <include refid="Base_Where_Clause"/>
+        <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+            ${pager.orderCondition}
+        </if>
+        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+    </select>
+
+    <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
+        <include refid="Base_Where_Clause"/>
+        <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+            ${pager.orderCondition}
+        </if>
+    </select>
+
+    <select id="selectByMenuId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+        select <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
+        <include refid="Base_Where_Clause"/>
+    </select>
+
+    <delete id="deleteByStandId" parameterType="java.lang.String">
+    delete from SAR_BUSS_STAND_MENU
+     where buss_stand_id = #{bussStandId}
+
+  </delete>
+
+    <select id="selectMenuByMenuParentId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+        select <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
+        where buss_stand_id = #{bussStandId} and valid_flag=0
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <update id="updateByStandIdAndMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
+        update SAR_BUSS_STAND_MENU
+        <set >
+            <if test="menuId != null" >
+                menu_id = #{menuId},
+            </if>
+        </set>
+        where buss_stand_id = #{bussStandId}
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <delete id="deleteByMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+        delete from SAR_BUSS_STAND_MENU
+        where buss_stand_id = #{bussStandId}
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <select id="selectAllMenuByStandId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+        select <include refid="Base_Column_List" />
+        from SAR_BUSS_STAND_MENU
+        where buss_stand_id = #{bussStandId} and valid_flag=0
+    </select>
+
+    <delete id="deleteByStandIdAndMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
+    delete from SAR_BUSS_STAND_MENU
+     where buss_stand_id = #{bussStandId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR}
+
+  </delete>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandPlan/SarBussStandPlanMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandPlan.dao.SarBussStandPlanDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -357,7 +357,7 @@
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
-        left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
+        left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
         where 1=1
         <trim suffixOverrides="," >
@@ -406,14 +406,14 @@
                 </foreach>
             </if>
             <!-- 游离态标准查询 -->
-            <if test="menuId != null and menuId =='nomenu'" >
-                and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
-            </if>
+<!--            <if test="menuId != null and menuId =='nomenu'" >-->
+<!--                and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
+<!--            </if>-->
             <!--  当第一次进入页面未选择记录时-->
-            <if test="(menuId == null or menuId =='') and menuRoleList == null" >
-                and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT SAR_MENU.id FROM SAR_MENU START WITH id =(
-                SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )
-            </if>
+<!--            <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
+<!--                and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
+<!--                SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
+<!--            </if>-->
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
                 and SAR_BUSS_STAND_MENU.MENU_ID in
@@ -466,7 +466,7 @@
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
-        left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
+        left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where 1=1
         <trim suffixOverrides="," >
             <!--                     基本搜索项                         -->
@@ -496,7 +496,7 @@
             <if test="menuId != null and menuId !='nomenu'" >
                 and SAR_BUSS_STAND_MENU.MENU_ID in (
                 select a.* from (
-                select SAR_MENU.id from SAR_MENU,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id
+                select TS_RESOURCE.id from TS_RESOURCE,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id
                 )a,TS_ROLE_SAR_MENU
                 where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
                 <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
@@ -507,14 +507,14 @@
             </if>
             <!-- 游离态标准查询 -->
             <if test="menuId != null and menuId =='nomenu'" >
-                and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
+                and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
             </if>
             <!--  当第一次进入页面未选择记录时-->
             <if test="menuId == null or menuId ==''" >
                 and SAR_BUSS_STAND_MENU.MENU_ID in (
                 select a.* from (
-                SELECT SAR_MENU.id FROM SAR_MENU START WITH id =(
-                SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id
+                SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(
+                SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id
                 )a,TS_ROLE_SAR_MENU
                 where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
                 <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
@@ -549,7 +549,7 @@
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
-        left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
+        left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where 1=1
         <trim suffixOverrides="," >
             <!--                     基本搜索项                         -->
@@ -662,7 +662,7 @@
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
-        left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
+        left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where SAR_BUSSIONESS_STAND.id = #{id}
 
     </select>