采购-报价管理：获取某采购处下所有可分配人员（采购处内贸科业务员、区域经理、采购处主管）

@@ -16,9 +16,11 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.entity.SysUserDept;
 import com.lframework.starter.web.inner.entity.SysUserDept;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.procurement.entity.SupplierQuotationDeal;
 import com.lframework.xingyun.sc.procurement.entity.SupplierQuotationDeal;
@@ -36,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
@@ -48,6 +51,18 @@ import org.springframework.transaction.annotation.Transactional;
 public class SupplierQuotationDealServiceImpl
 public class SupplierQuotationDealServiceImpl
         extends BaseMpServiceImpl<SupplierQuotationDealMapper, SupplierQuotationDeal>
         extends BaseMpServiceImpl<SupplierQuotationDealMapper, SupplierQuotationDeal>
         implements SupplierQuotationDealService {
         implements SupplierQuotationDealService {
+
+    private static final Set<String> ALLOWED_ASSIGN_ROLE_CODES = new HashSet<>();
+
+    static {
+        ALLOWED_ASSIGN_ROLE_CODES.add("htcgeczg");
+        ALLOWED_ASSIGN_ROLE_CODES.add("htcgyczg");
+        ALLOWED_ASSIGN_ROLE_CODES.add("ltcgczg");
+        ALLOWED_ASSIGN_ROLE_CODES.add("nmcgkywy");
+        ALLOWED_ASSIGN_ROLE_CODES.add("qyjl");
+        ALLOWED_ASSIGN_ROLE_CODES.add("ztcgczg");
+    }
+
     @Resource
     @Resource
     private SupplierQuotationProjectMapper supplierQuotationProjectMapper;
     private SupplierQuotationProjectMapper supplierQuotationProjectMapper;
     @Resource
     @Resource
@@ -58,6 +73,8 @@ public class SupplierQuotationDealServiceImpl
     private SysUserDeptService sysUserDeptService;
     private SysUserDeptService sysUserDeptService;
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private SysRoleService sysRoleService;
 
 
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
@@ -180,6 +197,8 @@ public class SupplierQuotationDealServiceImpl
             return Collections.emptyList();
             return Collections.emptyList();
         }
         }
         return userList.stream()
         return userList.stream()
+                .filter(user -> matchAllowedAssignRole(user.getId()))
+                .sorted((o1, o2) -> StringUtils.defaultString(o1.getName()).compareTo(StringUtils.defaultString(o2.getName())))
                 .map(QuerySysUserBo::new)
                 .map(QuerySysUserBo::new)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
@@ -213,4 +232,15 @@ public class SupplierQuotationDealServiceImpl
                 .distinct()
                 .distinct()
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
+
+    private boolean matchAllowedAssignRole(String userId) {
+        List<SysRole> sysRoleList = sysRoleService.getByUserId(userId);
+        if (CollectionUtil.isEmpty(sysRoleList)) {
+            return false;
+        }
+        return sysRoleList.stream()
+                .map(SysRole::getCode)
+                .filter(StringUtils::isNotBlank)
+                .anyMatch(ALLOWED_ASSIGN_ROLE_CODES::contains);
+    }
 }
 }

@@ -30,7 +30,7 @@ public interface SupplierQuotationDealService extends BaseMpService<SupplierQuot
     void assign(AssignSupplierQuotationDealVo vo);
     void assign(AssignSupplierQuotationDealVo vo);
 
 
     /**
     /**
-     * 获取当前部门及其子部门下人员
+     * 获取当前部门及其子部门下人员（采购处主管、区域经理、采购处业务员）
      *
      *
      * @param purchaseDepartment 部门主键
      * @param purchaseDepartment 部门主键
      */
      */