yzc 1 жил өмнө
parent
commit
5eaf7065bc

+ 4 - 0
hx-oa/pom.xml

@@ -29,6 +29,10 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-supply</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-jushuitan</artifactId>
+        </dependency>
     </dependencies>
 
 

+ 2 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/seal/po/SealUse.java

@@ -101,4 +101,6 @@ public class SealUse extends BasePo {
 
     private Long flowId;
 
+    private Long companyId;
+
 }

+ 4 - 0
hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -50,6 +51,9 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
     public Page<EducationSubsidyVo> getPage(EducationSubsidySelectDto dto) {
         IWrapper<EducationSubsidy> wrapper = getWrapper();
 
+        //权限过滤
+        AuthorityUtils.cofAuthority("es", EducationSubsidy::getCompanyId, wrapper);
+
         wrapper.keyword(dto.getKeyword(), new SqlField("es", EducationSubsidy::getCode));
         wrapper.eq("es", EducationSubsidy::getStatus, dto.getStatus());
 

+ 4 - 0
hx-oa/src/main/java/com/fjhx/oa/service/erp/impl/ErpCodingGroupServiceImpl.java

@@ -6,6 +6,7 @@ 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.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -48,6 +49,9 @@ public class ErpCodingGroupServiceImpl extends ServiceImpl<ErpCodingGroupMapper,
     public Page<ErpCodingGroupVo> getPage(ErpCodingGroupSelectDto dto) {
         IWrapper<ErpCodingGroup> wrapper = getWrapper();
 
+        //权限过滤
+        AuthorityUtils.cofAuthority("ecg", ErpCodingGroup::getCompanyId, wrapper);
+
         wrapper.keyword(dto.getKeyword(),
                 new SqlField("ecg", ErpCodingGroup::getCode),
                 new SqlField("ecg", ErpCodingGroup::getRemark)

+ 4 - 0
hx-oa/src/main/java/com/fjhx/oa/service/medical/impl/MedicalInsuranceServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.service.flow.FlowExampleService;
@@ -46,6 +47,9 @@ public class MedicalInsuranceServiceImpl extends ServiceImpl<MedicalInsuranceMap
     public Page<MedicalInsuranceVo> getPage(MedicalInsuranceSelectDto dto) {
         IWrapper<MedicalInsurance> wrapper = getWrapper();
 
+        //权限过滤
+        AuthorityUtils.cofAuthority("mi", MedicalInsurance::getCompanyId, wrapper);
+
         wrapper.keyword(dto.getKeyword(), new SqlField("mi", MedicalInsurance::getCode));
         wrapper.eq("mi", MedicalInsurance::getStatus, dto.getStatus());
 

+ 5 - 0
hx-oa/src/main/java/com/fjhx/oa/service/seal/impl/SealUseServiceImpl.java

@@ -5,6 +5,7 @@ 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.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -46,6 +47,9 @@ public class SealUseServiceImpl extends ServiceImpl<SealUseMapper, SealUse> impl
     public Page<SealUseVo> getPage(SealUseSelectDto dto) {
         IWrapper<SealUse> wrapper = getWrapper();
 
+        //权限过滤
+        AuthorityUtils.cofAuthority("su", SealUse::getCompanyId, wrapper);
+
         wrapper.keyword(dto.getKeyword(),
                 new SqlField("su", SealUse::getCode),
                 new SqlField("c.code")
@@ -80,6 +84,7 @@ public class SealUseServiceImpl extends ServiceImpl<SealUseMapper, SealUse> impl
     @DSTransactional
     @Override
     public void addOrEdit(SealUseDto sealUseDto) {
+        sealUseDto.setCompanyId(SecurityUtils.getCompanyId());
         this.saveOrUpdate(sealUseDto);
         ObsFileUtil.editFile(sealUseDto.getFileList(), sealUseDto.getId(), 10);
         ObsFileUtil.editFile(sealUseDto.getCompanyFileList(), sealUseDto.getId(), 20);

+ 1 - 0
hx-oa/src/main/resources/mapper/seal/SealUseMapper.xml

@@ -19,6 +19,7 @@
                su.is_returned,
                su.returned_user_id,
                su.reality_returned_time,
+               su.company_id,
                su.`status`,
                su.flow_id,
                su.create_user,