权限过滤修改

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateSelectDto.java

@@ -19,4 +19,6 @@ public class ContractTemplateSelectDto extends BaseSelectDto {
      */
     private Integer templateType;
 
+    private Long companyId;
+
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationSelectDto.java

@@ -7,11 +7,13 @@ import lombok.Setter;
 /**
  * 多公司配置列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @Getter
 @Setter
 public class CorporationSelectDto extends BaseSelectDto {
 
+    private Long companyId;
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -39,8 +40,13 @@ public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMap
         //合同类型过滤
         wrapper.eq("ct", ContractTemplate::getTemplateType, dto.getTemplateType());
 
-        //权限过滤：打款-子公司看自己的
-        wrapper.eq("ct.company_id", SecurityUtils.getCompanyId());
+        //权限过滤：合同模板-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("ct.company_id", companyId);
+        } else {
+            wrapper.eq("ct.company_id", dto.getCompanyId());
+        }
 
         wrapper.orderByDesc("ct", ContractTemplate::getId);
         Page<ContractTemplateVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

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

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -28,7 +29,7 @@ import java.util.stream.Collectors;
  * 多公司配置 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 //@DS(SourceConstant.COMMON)
@@ -44,8 +45,13 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
                     .or().like(Corporation::getNameEn, dto.getKeyword()));
         }
 
-        //权限过滤：打款-子公司看自己的
-        wrapper.eq("c.company_id", SecurityUtils.getCompanyId());
+        //权限过滤：企业信息配置-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("c.company_id", companyId);
+        } else {
+            wrapper.eq("c.company_id", dto.getCompanyId());
+        }
 
         wrapper.orderByDesc("c", Corporation::getId);