修复bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

@@ -35,12 +35,11 @@ public interface IOrgUsrService {
 	 * @param NAMEMethodName
 	 * @param PARENTIDMethodName
 	 * @param OrgTypeMethodName
-	 * @param KeyMethodName
 	 * @return
 	 * @throws Exception
 	 */
 	List<OrgMenuVo> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-							String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName, String KeyMethodName) throws Exception;
+							String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
 	/**
 	 * 获取子数据集合
@@ -56,7 +55,7 @@ public interface IOrgUsrService {
 	 * @throws Exception
 	 */
 	List<OrgMenuVo> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName, String KeyMethodName) throws Exception;
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
 	/**
 	 * 组装融合调度单位人员信息

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgMenuVo.java

@@ -14,28 +14,26 @@ import java.util.List;
 @Accessors(chain = true)
 @ApiModel(value="OrgMenuVo", description="树菜单")
 public class OrgMenuVo {
-    public String key;
+    public Long key;
     public String title;
-    public Long id;
     public Long parentId;
     public boolean leaf = true;
     public List<OrgMenuVo> children;
     public String bizOrgType;
-    public OrgMenuVo(String key, String title, Long parentId, String bizOrgType, boolean leaf, Long id) {
+    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
         super();
         this.key = key;
         this.title = title;
         this.parentId = parentId;
         this.bizOrgType = bizOrgType;
         this.leaf = leaf;
-        this.id= id;
     }
 
-    public OrgMenuVo(String key, String title, Long parentId, String bizOrgType, Long id) {
+    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType) {
         this.key = key;
-        this.id = id;
         this.title = title;
         this.parentId = parentId;
+        this.children = children;
         this.bizOrgType = bizOrgType;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java

@@ -140,7 +140,7 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位部门树", notes = "获取单位部门树")
     public ResponseModel< List<OrgMenuVo>>selectCompanyTree() throws Exception {
-        List<OrgMenuVo> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType", "getBizOrgCode");
+        List<OrgMenuVo> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         return ResponseHelper.buildResponse(menus);
     }