问题修正

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionPlanServiceImpl.java

@@ -107,7 +107,9 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
         //赋值产品信息
         WorkOrder workOrder = workOrderService.getById(result.getWorkOrderId());
         ProductInfo productInfo = productInfoService.getById(workOrder.getProductId());
-        result.setProductName(productInfo.getName());
+        if(ObjectUtil.isNotEmpty(productInfo)) {
+            result.setProductName(productInfo.getName());
+        }
         //赋值生产任务列表
         List<ProductionTask> list = productionTaskService.list(q -> q.eq(ProductionTask::getProductionPlanId, id));
         List<ProductionTaskVo> productionTaskVos = BeanUtil.copyToList(list, ProductionTaskVo.class);

hx-oa/src/main/java/com/fjhx/oa/entity/contacts/dto/ContactsSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class ContactsSelectDto extends BaseSelectDto {
 
+    /**
+     * 企业类型 1客户 2供应商 3自定义
+     */
+    private Integer enterpriseType;
+
 }

hx-oa/src/main/java/com/fjhx/oa/service/contacts/impl/ContactsServiceImpl.java

@@ -46,6 +46,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
     public Page<ContactsVo> getPage(ContactsSelectDto dto) {
         IWrapper<Contacts> wrapper = getWrapper();
         wrapper.orderByDesc("c", Contacts::getId);
+        wrapper.eq("c",Contacts::getEnterpriseType,dto.getEnterpriseType());
         if(ObjectUtil.isNotEmpty(dto.getKeyword())) {
             wrapper.and(q->q.like(Contacts::getContactName, dto.getKeyword())
                     .or()