合同:数据权限修改

@@ -20,6 +20,7 @@ import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.basedata.vo.workshop.QueryWorkshopVo;
 import com.lframework.xingyun.sc.controller.contract.ContractDistributorStandardController;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -117,10 +118,39 @@ public class ContractDistributorStandardServiceImpl extends
         if (!"DELETED".equals(vo.getStatus())) { // 不为删除状态，则根据角色查询不同的数据
             String userId = SecurityUtil.getCurrentUser().getId();
             List<SysRole> sysRoleList = sysRoleService.getByUserId(userId);
-            String roleCodeStr = CollectionUtils.emptyIfNull(sysRoleList).stream().map(SysRole::getCode).collect(Collectors.joining(","));
-            if (StringUtils.isNotBlank(roleCodeStr) && roleCodeStr.equals(YWY_ROLE_CODE)) { // 业务员只查询自己的数据
+            List<String> roleCodes = sysRoleList.stream()
+                    .map(SysRole::getCode)      // 提取每个 SysRole 的 code 属性
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(roleCodes) && roleCodes.contains(YWY_ROLE_CODE)) { // 业务员只查询自己的数据
                 vo.setCreateById(userId);
-            } else {
+            } else if (CollectionUtils.isNotEmpty(roleCodes) && (roleCodes.contains("yzkzg") || roleCodes.contains("dgfsbscfg")
+                    || roleCodes.contains("nbwzbscfg") || roleCodes.contains("szczbfbscfg") || roleCodes.contains("ztbscfg")
+                    || roleCodes.contains("sckzg") || roleCodes.contains("scbzg") || roleCodes.contains("yxbzg")
+                    || roleCodes.contains("yxzxzg") || roleCodes.contains("zjl") || roleCodes.contains("001"))) {
+                //运作科主管，营销部分管，市场科主管，市场部主管，营销部主管，营销中心主管，总经理，系统管理员可查看所有数据
+            } else if (CollectionUtils.isNotEmpty(roleCodes) && (roleCodes.contains("yfcjybjhy") || roleCodes.contains("efcjybjhy")
+                    || roleCodes.contains("sfcjybjhy") || roleCodes.contains("ztfcjybjhy") || roleCodes.contains("yfcjybzg")
+                    || roleCodes.contains("efcjybzg") || roleCodes.contains("sfcjybzg") || roleCodes.contains("ztcjybzg"))) {
+                //经营办计划员，经营办主管可以看到自己分厂的数据
+                Set<String> allowedRoles = new HashSet<>(Arrays.asList(
+                        "yfcjybjhy", "efcjybjhy", "sfcjybjhy", "ztfcjybjhy",
+                        "yfcjybzg", "efcjybzg", "sfcjybzg", "ztcjybzg"
+                ));
+                List<String> matchedRoles = roleCodes.stream()
+                        .filter(allowedRoles::contains)
+                        .collect(Collectors.toList());
+                Set<String> set = extractPrefixes(matchedRoles);
+                List<String> workshopIdList = new ArrayList<>();
+                for (String code : set) {
+                    QueryWorkshopVo vo1 = new QueryWorkshopVo();
+                    vo1.setCode(code);
+                    List<Workshop> query = workshopService.query(vo1);
+                    if (CollectionUtils.isNotEmpty(query)) {
+                        workshopIdList.add(query.get(0).getId());
+                    }
+                }
+                vo.setWorkshopIdList(workshopIdList);
+            }  else {
                 Map<String, List<String>> userIdMap = sysUserDeptService.mapAllUserByUserId(Collections.singletonList(userId), true);
                 vo.setCreateByIdList(CollectionUtils.isEmpty(userIdMap.get(userId)) ? new ArrayList<>(0) : userIdMap.get(userId));
                 vo.getCreateByIdList().add(userId);
@@ -156,6 +186,30 @@ public class ContractDistributorStandardServiceImpl extends
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
 
+    public static Set<String> extractPrefixes(List<String> matchedRoles) {
+        if (matchedRoles == null) {
+            return Collections.emptySet();
+        }
+
+        return matchedRoles.stream()
+                .filter(Objects::nonNull)
+                .map(role -> {
+                    if (role.startsWith("ztfc")) {
+                        return "ztfc";
+                    } else if (role.startsWith("yfc")) {
+                        return "yfc";
+                    } else if (role.startsWith("efc")) {
+                        return "efc";
+                    } else if (role.startsWith("sfc")) {
+                        return "sfc";
+                    } else {
+                        return null; // 不符合前缀，标记为 null 后续过滤
+                    }
+                })
+                .filter(Objects::nonNull)      // 过滤掉不匹配的角色
+                .collect(Collectors.toSet());  // 自动去重
+    }
+
     @Override
     public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
 

@@ -91,5 +91,9 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
 
     @ApiModelProperty("有审核权限的合同ID集合")
     private List<String> contractIdList;
+
+    @ApiModelProperty("生产厂ID集合")
+    private List<String> workshopIdList;
+
 }
 

@@ -185,7 +185,12 @@
             <if test="vo.standardApproved != null">
                 AND tb.standard_approved = #{vo.standardApproved}
             </if>
-
+            <if test="vo.workshopIdList != null and vo.workshopIdList.size() > 0">
+                OR tb.workshop_id IN
+                <foreach collection="vo.workshopIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
             <choose>
                 <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">
                 AND (tb.id IN