供应商报价：供应商查看权限（项目选择供应商部门则该部门下供应商能看见，为空则都可见）

@@ -87,6 +87,17 @@ public class SupplierQuotationProject extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 供应商部门ID
+     */
+    private String supplierDepartmentId;
+
+    /**
+     * 供应商部门名称
+     */
+    @TableField(exist = false)
+    private String supplierDepartmentName;
+
+    /**
      * 供应商报价
      */
     @TableField(exist = false)

@@ -9,12 +9,17 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysRole;
+import com.lframework.starter.web.inner.entity.SysUserDept;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
@@ -28,11 +33,17 @@ import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSupplierQuotatio
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySupplierQuotationProjectVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSupplierQuotationProjectVo;
 import java.io.Serializable;
+import java.security.Security;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
@@ -72,6 +83,10 @@ public class SupplierQuotationProjectServiceImpl
     private SupplierQuotationProjectQuoteMapper supplierQuotationProjectQuoteMapper;
     @Resource
     private ApplicationEventPublisher applicationEventPublisher;
+    @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
 
     @Override
     public PageResult<SupplierQuotationProject> query(Integer pageIndex, Integer pageSize, QuerySupplierQuotationProjectVo vo) {
@@ -85,11 +100,34 @@ public class SupplierQuotationProjectServiceImpl
 
     @Override
     public List<SupplierQuotationProject> query(QuerySupplierQuotationProjectVo vo) {
+        //供应商报价
+        String userId = SecurityUtil.getCurrentUser().getId();
+        Set<String> roleCodeSet = getRoleCodeSet(userId);
+
+        //判断是否为供应商角色
+        boolean isSupplier = roleCodeSet.contains("gys");
+        if (isSupplier) {
+            List<SysUserDept> userDepts = sysUserDeptService.getByUserId(userId);
+            List<String> userDeptIds = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(userDepts)) {
+                userDeptIds = userDepts.stream()
+                        .map(SysUserDept::getDeptId)
+                        .collect(Collectors.toList());
+                vo.setCurrentSupplierDeptIds(userDeptIds);
+            }
+        }
         List<SupplierQuotationProject> datas = getBaseMapper().query(vo);
         fillComputedStatus(datas);
         return datas;
     }
 
+    private Set<String> getRoleCodeSet(String userId) {
+        List<SysRole> sysRoleList = sysRoleService.getByUserId(userId);
+        return sysRoleList.stream()
+                .map(SysRole::getCode)
+                .collect(Collectors.toSet());
+    }
+
     @Override
     public List<SupplierQuotationProject> queryCurrentMonthBoardList(LocalDate month, String userId) {
         LocalDate monthStart = month.withDayOfMonth(1);

@@ -5,6 +5,8 @@ import com.lframework.starter.web.core.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -32,5 +34,8 @@ public class QuerySupplierQuotationProjectVo extends PageVo implements BaseVo, S
 
     @ApiModelProperty("开标时间结束")
     private LocalDateTime bidTimeEnd;
+
+    @ApiModelProperty("供应商部门IDs")
+    private List<String> currentSupplierDeptIds;
 }
 

@@ -16,6 +16,8 @@
         <result column="bid_time" property="bidTime"/>
         <result column="purchase_rule" property="purchaseRule"/>
         <result column="status" property="status"/>
+        <result column="supplier_department_id" property="supplierDepartmentId"/>
+        <result column="supplier_department_name" property="supplierDepartmentName"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -39,6 +41,8 @@
             tb.bid_time,
             tb.purchase_rule,
             tb.status,
+            tb.supplier_department_id,
+            sd.name AS supplier_department_name,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -47,6 +51,7 @@
             tb.update_time
         FROM procurement_supplier_quotation_project tb
         LEFT JOIN base_data_breed_relationship br ON br.id = tb.product_id
+        LEFT JOIN sys_dept sd ON sd.id = tb.supplier_department_id
     </sql>
 
     <select id="query" resultMap="SupplierQuotationProject">
@@ -73,6 +78,17 @@
             <if test="vo.bidTimeEnd != null">
                 AND tb.bid_time <![CDATA[ <= ]]> #{vo.bidTimeEnd}
             </if>
+            <!-- 供应商数据权限过滤 -->
+            <if test="vo.currentSupplierDeptIds != null and vo.currentSupplierDeptIds.size() > 0">
+                AND (
+                tb.supplier_department_id in
+                <foreach collection="vo.currentSupplierDeptIds" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+                OR
+                tb.supplier_department_id IS NULL
+                )
+            </if>
         </where>
         ORDER BY tb.create_time DESC, tb.id DESC
     </select>