fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/ICompanyDepartmentService.java

@@ -41,6 +41,13 @@ public interface ICompanyDepartmentService extends IService<CompanyDepartment> {
 	 */
 	Boolean updateByEditBo(CompanyDepartmentEditBo bo);
 
+	/**
+	 * 根据编辑业务对象修改企业部门
+	 * @param bo 企业部门编辑业务对象
+	 * @return
+	 */
+	List<CompanyDepartment> selectListByFartherId(Long departmentId);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyDepartmentServiceImpl.java

@@ -178,6 +178,7 @@ public class CompanyDepartmentServiceImpl extends ServiceImpl<CompanyDepartmentM
      *
      * @param departmentId 实体类数据
      */
+    @Override
     public List<CompanyDepartment> selectListByFartherId(Long departmentId){
         ArrayList<CompanyDepartment> sonCompanyDepartmentList = new ArrayList<>();
         List<CompanyDepartment> companyDepartments = this.baseMapper.selectList(new LambdaQueryWrapper<CompanyDepartment>().eq(CompanyDepartment::getDepartmentFartherId, departmentId).eq(CompanyDepartment::getStatus, 1));

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyServiceImpl.java

@@ -160,6 +160,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         List<CompanyVo> companyVos = this.queryList(bo);
         if (ObjectUtil.isNotEmpty(companyVos)) {
             companyVos.forEach(item -> {
+                List<Staff> staff = iStaffService.list(new LambdaQueryWrapper<Staff>().eq(Staff::getCompanyId, item.getCompanyId()).eq(Staff::getStatus, 1));
+                item.setCompanyStaffNum(staff.size());
                 //判断当前企业是否关联企业证书和员工信息
                 List<CompanyCertificate> companyCertificates = iCompanyCertificateService.list(new LambdaQueryWrapper<CompanyCertificate>().eq(CompanyCertificate::getCompanyId, item.getCompanyId()).eq(CompanyCertificate::getStatus, 1));
                 List<Staff> staffList = iStaffService.list(new LambdaQueryWrapper<Staff>().eq(Staff::getCompanyId, item.getCompanyId()).eq(Staff::getStatus, 1));
@@ -170,6 +172,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 }
                 List<CompanyDepartment> list = iCompanyDepartmentService.list(new LambdaQueryWrapper<CompanyDepartment>().eq(CompanyDepartment::getCompanyId, item.getCompanyId())
                         .eq(CompanyDepartment::getStatus, 1));
+                list.forEach(companyDepartment -> {
+                    List<CompanyDepartment> companyDepartments = iCompanyDepartmentService.selectListByFartherId(companyDepartment.getDepartmentId());
+                    List<Long> collect = companyDepartments.stream().map(CompanyDepartment::getDepartmentId).collect(Collectors.toList());
+                    collect.add(companyDepartment.getDepartmentId());
+                    int count = iStaffService.count(new LambdaQueryWrapper<Staff>().in(Staff::getDepartmentId, collect).eq(Staff::getStatus,1));
+                    companyDepartment.setDepartmentNum((long) count);
+                    iCompanyDepartmentService.updateById(companyDepartment);
+                });
                 list = iCompanyDepartmentService.buildDeptTree(list);
                 if (ObjectUtil.isNotEmpty(list)) {
                     item.setCompanyDepartmentList(list);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/CompanyVo.java

@@ -105,13 +105,17 @@ public class CompanyVo {
 	@Excel(name = "1有效 0无效")
 	@ApiModelProperty("1有效 0无效")
 	private Integer status;
-	/** 公司父子部门列表 */
-	@Excel(name = "公司父子部门列表")
-	@ApiModelProperty("公司父子部门列表")
-	private List<CompanyDepartment> companyDepartmentList;
 	/** 是否可删除状态 1可删除 2 不可删除 */
 	@Excel(name = "是否可删除状态")
 	@ApiModelProperty("是否可删除状态")
 	private Integer deleteStatus;
+	/** 公司人数 */
+	@Excel(name = "公司人数")
+	@ApiModelProperty("公司人数")
+	private Integer companyStaffNum;
+	/** 公司父子部门列表 */
+	@Excel(name = "公司父子部门列表")
+	@ApiModelProperty("公司父子部门列表")
+	private List<CompanyDepartment> companyDepartmentList;
 
 }