获取 承包商管理-安全交底 列表 修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/manage/controller/TContractorSafetyBriefController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.testor.common.constant.StatusEnum;
 import com.testor.common.util.BeanConverUtil;
 import com.testor.module.contractor.common.model.constant.ContractorProcessStatus;
+import com.testor.module.contractor.ledger.dao.TContractorLedgerDao;
 import com.testor.module.contractor.ledger.model.domain.TContractorProject;
 import com.testor.module.contractor.ledger.model.dto.TContractorLedgerDto;
 import com.testor.module.contractor.ledger.service.TContractorLedgerService;
@@ -35,7 +36,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -64,6 +67,9 @@ public class TContractorSafetyBriefController extends SuperController
 	@Autowired
 	private TContractorProjectService tContractorProjectService;
 
+	@Resource
+	private TContractorLedgerDao contractorLedgerDao;
+
     /* Generated Method*/
 	@ApiOperation(value = "新增 承包商管理-安全交底", notes = "Add TContractorSafetyBrief")
 	@PostMapping(value = "/add")
@@ -263,7 +269,12 @@ public class TContractorSafetyBriefController extends SuperController
 		QueryWrapper<TContractorSafetyBrief> queryWrapper=new QueryWrapper<>();
 		UserInfo loginUser = ContextUtils.getLoginUser();
 		String orgId = loginUser.getOrgId();
-		List<String> idsChildrenById = newSysOrgService.getIdsChildrenById(orgId);
+		//List<String> idsChildrenById = newSysOrgService.getIdsChildrenById(orgId);
+		List<String> idsChildrenById = new ArrayList<>();
+		idsChildrenById.addAll(Arrays.asList(contractorLedgerDao.orgIdDistinct(orgId).split(",")));
+		log.info("承包商人员台账列表--ids1------>ids值:{}",idsChildrenById);
+		idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
+		log.info("承包商人员台账列表--ids2------>ids值:{}",idsChildrenById);
 		//查询下级机构id
 		queryWrapper.in("org_id", idsChildrenById);