危险作业列表东北港口所属组织机构查询所有

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -80,6 +80,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
 import org.quartz.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.Constants;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
@@ -1959,16 +1960,40 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
 
 
+            /*List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
+                    .filter(s -> !s.trim().isEmpty()) // 忽略空值
+                    .collect(Collectors.toList());
+            List<String> idsChildrenById = new  ArrayList<>();
+            for(String orgId:list){
+                idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
+            }
+            idsChildrenById.addAll(list);
+            //查询下级机构id
+            queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
+
             List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
                     .filter(s -> !s.trim().isEmpty()) // 忽略空值
                     .collect(Collectors.toList());
             List<String> idsChildrenById = new  ArrayList<>();
+
+            boolean isDbgk = false;
             for(String orgId:list){
+                NewSysOrg org = newSysOrgService.getOne(new QueryWrapper<NewSysOrg>().eq("org_id", orgId));
+                if(org.getParentIds().contains(com.testor.common.core.constant.Constants.DBGK_ORG_ID)){
+                    isDbgk = true;
+                }
                 idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
             }
+
             idsChildrenById.addAll(list);
+            //如果是东北港口下的部门,查询东北港口所有
+            if(isDbgk){
+                idsChildrenById.addAll(newSysOrgService.dbgkChildOrgIds());
+                idsChildrenById.add(com.testor.common.core.constant.Constants.DBGK_ORG_ID);
+            }
             //查询下级机构id
             queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);
+
         }
         if (StringHelper.isNotEmpty(queryParam.getStatus())) {
             queryWrapper.eq(THazardWorkPlan.STATUS, queryParam.getStatus());

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysUserController.java

@@ -496,6 +496,32 @@ public class NewSysUserController extends SuperController {
         return baseResponse;
     }
 
+    /*@ApiOperation(value = "【危险作业--- 根据当前机构id获取子组织机构树及子部门、人员信息】 ", notes = "personnelInfo 为空时或0时，获取人员信息；isSubordinates 是否包含下属 0否 1是")
+    @GetMapping(value = "/getOrgAndTreeHazardWorkPlan")
+    public BaseResponse<NewTreeVo> getOrgAndTreeHazardWorkPlan(String orgId, String personnelInfo,@RequestParam(value = "isSubordinates",defaultValue = "0") String isSubordinates) {
+        BaseResponse<NewTreeVo> baseResponse = new BaseResponse<>();
+        NewSysOrg org = sysOrgService.getOne(new QueryWrapper<NewSysOrg>().eq("org_id", orgId));
+
+        List<NewSysOrg> allOrgs = new ArrayList<>();
+
+        //东北港口所属组织机构查询整个东北港口树
+        if(org.getParentIds().contains(com.testor.common.core.constant.Constants.DBGK_ORG_ID)){
+            orgId = com.testor.common.core.constant.Constants.DBGK_ORG_ID;
+        }
+
+        // 获取所有非删除状态的SysOrg记录
+        allOrgs = sysOrgService.list(new QueryWrapper<NewSysOrg>()
+                .ne(SysOrg.STATUS, BizConstants.STATUS_DELETE));
+
+        // 使用Map来存储orgId到SysOrg的映射
+        Map<String, NewSysOrg> orgMap = allOrgs.stream()
+                .collect(Collectors.toMap(NewSysOrg::getOrgId, Function.identity()));
+        // 构建树结构
+        NewTreeVo rootNewTreeVo = buildTree(orgId, orgMap, personnelInfo,0,isSubordinates);
+        baseResponse.setData(rootNewTreeVo);
+        return baseResponse;
+    }*/
+
     /**
      * 构建树
      * @param orgId

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/dao/NewSysOrgDao.java

@@ -44,5 +44,13 @@ public interface NewSysOrgDao extends SuperDao<NewSysOrg> {
             "\tAND parent_id != '0';"})
     List<NewSysOrg> findSubSectorPath(@Param("orgId") String orgId);
 
+    /**
+     * 获取东北港口所有子机构
+     * @return
+     */
+    @Select("select org_id from t_sys_org \n" +
+            "where is_dept = '0' and parent_ids like '%1335dbc3f81b4919bf59014fede4819d%'")
+    List<String> dbgkChildOrgIds();
+
 
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/NewSysOrgService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.testor.biz.sys.org.model.domain.SysOrg;
 import com.testor.module.sys.model.domian.NewSysOrg;
 import com.testor.module.sys.model.vo.SysOrgVo;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -114,4 +115,11 @@ public interface NewSysOrgService extends IService<NewSysOrg> {
     Integer getOrgTypeByOrgId(String orgId);
 
     List<NewSysOrg> getOrgByOrgName(String orgName);
+
+    /**
+     * 获取东北港口所有子机构
+     * @return
+     */
+    List<String> dbgkChildOrgIds();
+
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/NewSysOrgServiceImpl.java

@@ -277,4 +277,9 @@ public class NewSysOrgServiceImpl extends SuperServiceImpl<NewSysOrgDao, NewSysO
     public List<NewSysOrg> getOrgByOrgName(String orgName) {
         return list(new QueryWrapper<NewSysOrg>().eq("org_name", orgName).eq("status", "0"));
     }
+
+    @Override
+    public List<String> dbgkChildOrgIds() {
+        return baseMapper.dbgkChildOrgIds();
+    }
 }