项目公司

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -902,7 +902,37 @@ public class UserController {
     public ResponseEntity treeFinanceOffice(@RequestParam(required = false) String tenantId,@RequestParam(required = false) String extId, @RequestParam(required = false) String type, @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         String id = userDTO.getTenantDTO().getId();
-        if (id.equals("10002")){
+        if(id.equals("10005")){
+            String officeName="兴光会计师事务所";
+            List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
+            if(list.size()>0){
+                List<String> officeIds = Lists.newArrayList();
+                for (OfficeDTO info : list) {
+                    info.setTypeFlag(true);
+                    officeIds.add(info.getId());
+                }
+                //根据部门查询对应部门下的所有数据
+                List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
+                list.addAll(officeDTOList);
+            }
+            String officeName2="兴光项目公司";
+            List<OfficeDTO> list2 = officeService.getOfficeAllByOfficeName (officeName2);
+            if(list2.size()>0){
+                List<String> officeIds = Lists.newArrayList();
+                for (OfficeDTO info : list2) {
+                    info.setTypeFlag(true);
+                    officeIds.add(info.getId());
+                }
+                //根据部门查询对应部门下的所有数据
+                List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
+                list2.addAll(officeDTOList);
+            }
+            List<OfficeDTO> objects1 = new ArrayList<>();
+            objects1.addAll(list);
+            objects1.addAll(list2);
+            List rootTree = officeService.getFinanceTree (objects1, extId, type, showAll, "1");
+            return ResponseEntity.ok (rootTree);
+        }else if (id.equals("10002")){
             String officeName="兴光会计师事务所";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
@@ -949,10 +979,13 @@ public class UserController {
             List rootTree = officeService.getFinanceRootTree (list, extId, type, showAll, "1");
             return ResponseEntity.ok (rootTree);
         }
-
     }
 
 
 
 
+
+
+
+
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -117,5 +117,6 @@ public interface OfficeMapper extends TreeMapper <Office> {
      */
     List<String> getIds(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<Office> getChild(@Param("rootId")String rootId);
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -523,18 +523,47 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
 
 
     public List getFinanceTree(List<OfficeDTO> objects, String extId, String type, String showAll, String showMyOffice) {
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        String id = userDTO.getTenantDTO().getId();
+
         List<OfficeDTO> offices = Lists.newArrayList ();
         // 获取到所有parent_id为‘0’的部门数据
         List<Office> children = officeMapper.getChild(OfficeDTO.getRootId());
         List<OfficeDTO> rootTrees = OfficeWrapper.INSTANCE.toDTO (children);
-        for (OfficeDTO root : rootTrees) {
-            if (root.getName().equals("兴光会计师事务所")||root.getName().equals("综合管理公司")){
-                if (this.isUseAble ( extId, type,root, showAll )){
-                    // 不是被排除节点的子节点
-                    List<OfficeDTO> officeList = formatListToTree (root, objects, extId, type, showAll);
-                    offices.addAll (officeList);
+        switch (id){
+            case "10002":   //综合管理部
+                for (OfficeDTO root : rootTrees) {
+                    if (root.getId().equals("1588068195545808898")||root.getId().equals("1680778353809350658")){
+                        if (this.isUseAble ( extId, type,root, showAll )){
+                            // 不是被排除节点的子节点
+                            List<OfficeDTO> officeList = formatListToTree (root, objects, extId, type, showAll);
+                            offices.addAll (officeList);
+                        }
+                    }
                 }
-            }
+                break;
+            case "10005":   //项目公司
+                for (OfficeDTO root : rootTrees) {
+                    if (root.getId().equals("1588068195545808898")||root.getId().equals("1619953441268330498")){
+                        if (this.isUseAble ( extId, type,root, showAll )){
+                            // 不是被排除节点的子节点
+                            List<OfficeDTO> officeList = formatListToTree (root, objects, extId, type, showAll);
+                            offices.addAll (officeList);
+                        }
+                    }
+                }
+                break;
+            default:
+                for (OfficeDTO root : rootTrees) {
+                    if (root.getId().equals("1588068195545808898")){
+                        if (this.isUseAble ( extId, type,root, showAll )){
+                            // 不是被排除节点的子节点
+                            List<OfficeDTO> officeList = formatListToTree (root, objects, extId, type, showAll);
+                            offices.addAll (officeList);
+                        }
+                    }
+                }
+                break;
         }
         if (StringUtils.isNotBlank(showMyOffice)) {
             OfficeDTO officeDTO = UserUtils.getCurrentUserDTO().getOfficeDTO();