1.修改工作台菜单过滤显示

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -350,4 +350,15 @@ public class CommonController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/workbench/permission")
+    @ApiOperation(httpMethod = "GET", value = "菜单及登录人信息", notes = "菜单及登录人信息")
+    public ResponseModel<Map<String, Object>> permissionTree(@RequestParam String menuAgent,
+                                                             @RequestParam String permissionType,
+                                                             @RequestParam(required = false) String path) {
+        Map<String, Object> result = commonService.getPermissionTreeWithCompany(menuAgent, permissionType, path, getSelectedOrgInfo().getCompany());
+        return ResponseHelper.buildResponse(result);
+    }
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
@@ -64,4 +65,7 @@ public interface ICommonService {
     List<LinkedHashMap> getReceiveUnitTree(String bizType);
 
     Boolean checkUniquenessOfEQUCODE(String equCode);
+
+
+    Map<String, Object> getPermissionTreeWithCompany(String menuAgent, String permissionType, String path, CompanyBo company);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -44,7 +44,10 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActTaskDTO;
@@ -355,6 +358,14 @@ public class CommonServiceImpl implements ICommonService {
         return count > 0;
     }
 
+    @Override
+    public Map<String, Object> getPermissionTreeWithCompany(String menuAgent, String permissionType, String path, CompanyBo company) {
+        Map<String, Object> result = new HashMap<>();
+        Collection<PermissionModel>  permissionModels = FeignUtil.remoteCall(()->Privilege.permissionClient.currentPermissionTree(menuAgent, permissionType, null, path));
+        result.put("permission", permissionModels);
+        result.put("company", company);
+        return result;
+    }
 
     @Override
     public List<LinkedHashMap> getTree(ReginParams reginParams) {