企业信息管理、合同模板 添加权限

hx-common/src/main/java/com/fjhx/common/entity/contract/po/ContractTemplate.java

@@ -36,4 +36,9 @@ public class ContractTemplate extends BasePo {
      */
     private String templateContent;
 
+    /**
+     * 归属公司
+     */
+    private Long companyId;
+
 }

hx-common/src/main/java/com/fjhx/common/entity/contract/vo/ContractTemplateVo.java

@@ -24,6 +24,9 @@ public class ContractTemplateVo extends ContractTemplate {
      */
     private String corporationNumber;
 
-
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
 
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -141,4 +141,9 @@ public class Corporation extends BasePo {
      * 联系人电话
      */
     private String contactPhone;
+
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/vo/CorporationVo.java

@@ -1,6 +1,5 @@
 package com.fjhx.common.entity.corporation.vo;
 
-import com.fjhx.area.service.ISetAreaName;
 import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import lombok.Getter;
@@ -22,4 +21,6 @@ public class CorporationVo extends Corporation implements SetCustomizeAreaName {
 
     private String cityName;
 
+    private String companyName;
+
 }

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -9,10 +9,16 @@ import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
 import com.fjhx.common.mapper.contract.ContractTemplateMapper;
 import com.fjhx.common.service.contract.ContractTemplateService;
+import com.fjhx.tenant.utils.DeptUstil;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -33,9 +39,29 @@ public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMap
         //合同类型过滤
         wrapper.eq("ct", ContractTemplate::getTemplateType, dto.getTemplateType());
 
+        //权限过滤：打款-子公司看自己的
+        wrapper.eq("ct.company_id", SecurityUtils.getCompanyId());
+
         wrapper.orderByDesc("ct", ContractTemplate::getId);
+        Page<ContractTemplateVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<ContractTemplateVo> records = page.getRecords();
+
+        if (records.size() == 0) {
+            return page;
+        }
+
+        //获取生产公司信息
+        List<Long> companyIds = records.stream().map(ContractTemplateVo::getCompanyId).collect(Collectors.toList());
+        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+
+        for (ContractTemplateVo record : records) {
+            //赋值生产公司名称
+            record.setCompanyName(companyNameMap.get(record.getCompanyId()));
+        }
+
+        return page;
 
-        return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
     @Override

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -2,12 +2,10 @@ package com.fjhx.common.service.corporation.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.CustomizeAreaUtil;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.dto.CorporationDto;
 import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
 import com.fjhx.common.entity.corporation.po.Corporation;
@@ -15,10 +13,14 @@ import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.fjhx.common.mapper.corporation.CorporationMapper;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.tenant.utils.DeptUstil;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -36,14 +38,35 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
     @Override
     public Page<CorporationVo> getPage(CorporationSelectDto dto) {
         IWrapper<Corporation> wrapper = getWrapper();
-        wrapper.orderByDesc("c", Corporation::getId);
-        if(ObjectUtil.isNotEmpty(dto.getKeyword())){
-            wrapper.and(q->q.like(Corporation::getName,dto.getKeyword())
-                    .or().like(Corporation::getLegalPersonName,dto.getKeyword())
-                    .or().like(Corporation::getNameEn,dto.getKeyword()));
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            wrapper.and(q -> q.like(Corporation::getName, dto.getKeyword())
+                    .or().like(Corporation::getLegalPersonName, dto.getKeyword())
+                    .or().like(Corporation::getNameEn, dto.getKeyword()));
         }
+
+        //权限过滤：打款-子公司看自己的
+        wrapper.eq("c.company_id", SecurityUtils.getCompanyId());
+
+        wrapper.orderByDesc("c", Corporation::getId);
+
+
         Page<CorporationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<CorporationVo> records = page.getRecords();
+
+
+        if (records.size() == 0) {
+            return page;
+        }
+
+        //获取生产公司信息
+        List<Long> companyIds = records.stream().map(Corporation::getCompanyId).collect(Collectors.toList());
+        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+
+        for (CorporationVo record : records) {
+            //赋值生产公司名称
+            record.setCompanyName(companyNameMap.get(record.getCompanyId()));
+        }
+
         // 赋值国省市
         CustomizeAreaUtil.setAreaName(records);
         return page;