diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/controller/SarGroupMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/controller/SarGroupMenuController.java
index 8b7736d6..a7647dfd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/controller/SarGroupMenuController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/controller/SarGroupMenuController.java
@@ -1,12 +1,25 @@
 package com.adc.da.slrs.sarGroupMenu.controller;
 
 
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarGroupMenu.page.SarGroupMenuEOPage;
+import com.adc.da.slrs.sarGroupMenu.service.ISarGroupMenuService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarGroupMenu.entity.SarGroupMenu;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
 * <p>
     * 树形结构 前端控制器
@@ -20,4 +33,39 @@ import com.adc.da.base.web.BaseController;
 @RequestMapping("/sarGroupMenu/sar-group-menu")
 public class SarGroupMenuController extends BaseController<SarGroupMenu> {
 
+    @Autowired
+    private ISarGroupMenuService sarGroupMenuEOService;
+
+    /**
+     * 根据分标委id查询工作组
+     * @author: hehaiyue
+     * @description: TODO
+     * @date: 2020/11/23 11:25
+     * @return
+     */
+    @ApiOperation(value = "|SarGroupMenuEO|查询工作组")
+    @GetMapping("/queryGroup")
+    public ResponseMessage<List<Map<String,String>>> queryGroup(String fbwId) throws  Exception{
+        SarGroupMenuEOPage page = new SarGroupMenuEOPage();
+        page.setVlagFlag("0");
+        page.setMenuLevel("3");
+        page.setMenuType("GROUP");
+        List<SarGroupMenu> groupList = new ArrayList<SarGroupMenu>();
+        if(StringUtils.isNotBlank(fbwId)){
+            page.setPid(fbwId);
+            groupList = sarGroupMenuEOService.queryByList(page);
+        }
+        else{
+            groupList = sarGroupMenuEOService.queryByList(page);
+        }
+        List<Map<String,String>> list = new ArrayList<Map<String,String>>();
+        for(SarGroupMenu sarGroupMenuEO : groupList){
+            Map<String,String> map = new HashMap<String,String>();
+            map.put("menuName",sarGroupMenuEO.getMenuName());
+            map.put("id",sarGroupMenuEO.getId());
+            map.put("pid",sarGroupMenuEO.getPid());
+            list.add(map);
+        }
+        return Result.success("查询成功",list);
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/dao/SarGroupMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/dao/SarGroupMenuDao.java
index ac1ec360..e2065790 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/dao/SarGroupMenuDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/dao/SarGroupMenuDao.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarGroupMenu.dao;
 
 import com.adc.da.slrs.sarGroupMenu.entity.SarGroupMenu;
+import com.adc.da.slrs.sarGroupMenu.page.SarGroupMenuEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +17,8 @@ import java.util.List;
  */
 public interface SarGroupMenuDao extends BaseMapper<SarGroupMenu> {
 
+    List<SarGroupMenu> queryByList(SarGroupMenuEOPage page);
+
     String getNamesByIds(@Param("list") String[] list);
 
     String getIdsByNames(@Param("list") String[] list);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/entity/SarGroupMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/entity/SarGroupMenu.java
index cff8217b..61dc56e7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/entity/SarGroupMenu.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/entity/SarGroupMenu.java
@@ -2,14 +2,19 @@ package com.adc.da.slrs.sarGroupMenu.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.utils.treetool.annotation.*;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 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 org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -29,14 +34,17 @@ public class SarGroupMenu extends BaseEntity {
 
     @ApiModelProperty(value = "ID")
     @TableId("ID")
+    @TreeNodeId
     private String id;
 
     @ApiModelProperty(value = "PID")
     @TableField("PID")
+    @TreeNodeParentId
     private String pid;
 
     @ApiModelProperty(value = "节点名称")
     @TableField("MENU_NAME")
+    @TreeNodeName
     private String menuName;
 
     @ApiModelProperty(value = "节点类型")
@@ -45,29 +53,39 @@ public class SarGroupMenu extends BaseEntity {
 
     @ApiModelProperty(value = "节点层级")
     @TableField("MENU_LEVEL")
-    private BigDecimal menuLevel;
+    @TreeNodeLevel
+    private String menuLevel;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATE_TIME")
-    private LocalDateTime createTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @TableField("CREATE_USERID")
     private String createUserid;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("MODIFY_TIME")
-    private LocalDateTime modifyTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
 
     @TableField("MODIFY_USERID")
     private String modifyUserid;
 
     @ApiModelProperty(value = "判断标识")
     @TableField("VLAG_FLAG")
-    private BigDecimal vlagFlag;
+    private String vlagFlag;
 
     @ApiModelProperty(value = "标准编号")
     @TableField("STAND_NO")
     private String standNo;
 
+    @TableField(exist = false)
+    private String detailId;
+
+    @TableField(exist = false)
+    @TreeNodeOrder
+    private Integer orderNum;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/page/SarGroupMenuEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/page/SarGroupMenuEOPage.java
new file mode 100644
index 00000000..02553c59
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/page/SarGroupMenuEOPage.java
@@ -0,0 +1,42 @@
+package com.adc.da.slrs.sarGroupMenu.page;
+
+import com.adc.da.base.page.BasePage;
+import lombok.Data;
+
+/**
+ * <b>功能：</b>SAR_GROUP_MENU SarGroupMenuEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-11-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+@Data
+public class SarGroupMenuEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String pid;
+    private String pidOperator = "=";
+    private String menuName;
+    private String menuNameOperator = "=";
+    private String menuType;
+    private String menuTypeOperator = "=";
+    private String menuLevel;
+    private String menuLevelOperator = "=";
+    private String createTime;
+    private String createTime1;
+    private String createTime2;
+    private String createTimeOperator = "=";
+    private String createUserid;
+    private String createUseridOperator = "=";
+    private String modifyTime;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String modifyUserid;
+    private String modifyUseridOperator = "=";
+    private String vlagFlag;
+    private String vlagFlagOperator = "=";
+    private String standNo;
+    private String standNoOperator = "=";
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/ISarGroupMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/ISarGroupMenuService.java
index e7788340..65c6634f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/ISarGroupMenuService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/ISarGroupMenuService.java
@@ -1,8 +1,11 @@
 package com.adc.da.slrs.sarGroupMenu.service;
 
 import com.adc.da.slrs.sarGroupMenu.entity.SarGroupMenu;
+import com.adc.da.slrs.sarGroupMenu.page.SarGroupMenuEOPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 树形结构 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISarGroupMenuService extends IService<SarGroupMenu> {
 
+    List<SarGroupMenu> queryByList(SarGroupMenuEOPage page);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/impl/SarGroupMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/impl/SarGroupMenuServiceImpl.java
index 6b925162..bda66603 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/impl/SarGroupMenuServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarGroupMenu/service/impl/SarGroupMenuServiceImpl.java
@@ -2,10 +2,14 @@ package com.adc.da.slrs.sarGroupMenu.service.impl;
 
 import com.adc.da.slrs.sarGroupMenu.entity.SarGroupMenu;
 import com.adc.da.slrs.sarGroupMenu.dao.SarGroupMenuDao;
+import com.adc.da.slrs.sarGroupMenu.page.SarGroupMenuEOPage;
 import com.adc.da.slrs.sarGroupMenu.service.ISarGroupMenuService;
 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>
  * 树形结构 服务实现类
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class SarGroupMenuServiceImpl extends ServiceImpl<SarGroupMenuDao, SarGroupMenu> implements ISarGroupMenuService {
 
+    @Autowired
+    private SarGroupMenuDao dao;
+
+    @Override
+    public List<SarGroupMenu> queryByList(SarGroupMenuEOPage page){
+        return dao.queryByList(page);
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarGroupMenu/SarGroupMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarGroupMenu/SarGroupMenuMapper.xml
index 2e4f864b..7ef56388 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarGroupMenu/SarGroupMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarGroupMenu/SarGroupMenuMapper.xml
@@ -128,6 +128,14 @@
         </trim>
     </sql>
 
+    <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select <include refid="Base_Column_List"/>,SAR_GROUP_DETAIL.id as detail_id from SAR_GROUP_MENU left join SAR_GROUP_DETAIL on ( SAR_GROUP_MENU.id = SAR_GROUP_DETAIL.menu_id)
+        <include refid="Base_Where_Clause"/>
+        <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+            ${pager.orderCondition}
+        </if>
+    </select>
+
     <select id="getNamesByIds" resultType="java.lang.String" parameterType="java.util.List">
         select
         group_concat(MENU_NAME ORDER BY MENU_NAME separator ',')