From edb0078765be0973dc3b5fffc61398d69b0035fe Mon Sep 17 00:00:00 2001 From: AgAngle <1323481023@qq.com> Date: Thu, 3 Apr 2025 17:52:03 +0800 Subject: [PATCH] fix: mobile client adjust --- .../resolver/field/AbstractModuleFieldResolver.java | 10 +--------- .../resolver/field/ModuleFieldResolverFactory.java | 1 - .../common/resolver/{ => field}/RadioResolver.java | 3 +-- .../io/cordys/crm/clue/dto/request/ClueAddRequest.java | 1 - .../java/io/cordys/crm/clue/service/ClueService.java | 3 +++ .../controller/CustomerFollowPlanController.java | 4 ---- .../crm/customer/dto/request/CustomerAddRequest.java | 1 - .../dto/request/CustomerContactAddRequest.java | 1 - .../crm/customer/service/CustomerContactService.java | 4 ++++ .../cordys/crm/customer/service/CustomerService.java | 3 +++ .../crm/follow/dto/request/FollowUpPlanAddRequest.java | 1 - .../follow/dto/request/FollowUpRecordAddRequest.java | 1 - .../cordys/crm/follow/service/FollowUpPlanService.java | 4 ++++ .../crm/follow/service/FollowUpRecordService.java | 3 +++ .../opportunity/dto/request/OpportunityAddRequest.java | 1 - .../crm/opportunity/service/OpportunityService.java | 3 +++ 16 files changed, 22 insertions(+), 22 deletions(-) rename backend/crm/src/main/java/io/cordys/common/resolver/{ => field}/RadioResolver.java (87%) diff --git a/backend/crm/src/main/java/io/cordys/common/resolver/field/AbstractModuleFieldResolver.java b/backend/crm/src/main/java/io/cordys/common/resolver/field/AbstractModuleFieldResolver.java index d8929144c..240bf698a 100644 --- a/backend/crm/src/main/java/io/cordys/common/resolver/field/AbstractModuleFieldResolver.java +++ b/backend/crm/src/main/java/io/cordys/common/resolver/field/AbstractModuleFieldResolver.java @@ -1,7 +1,6 @@ package io.cordys.common.resolver.field; -import io.cordys.common.constants.RuleValidatorConstants; import io.cordys.common.exception.GenericException; import io.cordys.common.util.JSON; import io.cordys.common.util.Translator; @@ -54,14 +53,7 @@ public abstract class AbstractModuleFieldResolver { } protected void validateRequired(T customField, Object value) { - if (!hasValidatorKey(customField.getRules(), RuleValidatorConstants.REQUIRED)) { - return; - } - if (value == null - || (value instanceof String && StringUtils.isBlank(value.toString())) - || (value instanceof List listValue && CollectionUtils.isEmpty((listValue)))) { - throwValidateException(customField.getName()); - } + // 移动端，不一定需要校验必填，暂时不校验 } protected void validateArray(String name, Object value) { diff --git a/backend/crm/src/main/java/io/cordys/common/resolver/field/ModuleFieldResolverFactory.java b/backend/crm/src/main/java/io/cordys/common/resolver/field/ModuleFieldResolverFactory.java index 7b5f96b7b..da758cfb1 100644 --- a/backend/crm/src/main/java/io/cordys/common/resolver/field/ModuleFieldResolverFactory.java +++ b/backend/crm/src/main/java/io/cordys/common/resolver/field/ModuleFieldResolverFactory.java @@ -1,6 +1,5 @@ package io.cordys.common.resolver.field; -import io.cordys.common.resolver.RadioResolver; import io.cordys.crm.system.constants.FieldType; import java.util.HashMap; diff --git a/backend/crm/src/main/java/io/cordys/common/resolver/RadioResolver.java b/backend/crm/src/main/java/io/cordys/common/resolver/field/RadioResolver.java similarity index 87% rename from backend/crm/src/main/java/io/cordys/common/resolver/RadioResolver.java rename to backend/crm/src/main/java/io/cordys/common/resolver/field/RadioResolver.java index c9fe29871..790cd008f 100644 --- a/backend/crm/src/main/java/io/cordys/common/resolver/RadioResolver.java +++ b/backend/crm/src/main/java/io/cordys/common/resolver/field/RadioResolver.java @@ -1,7 +1,6 @@ -package io.cordys.common.resolver; +package io.cordys.common.resolver.field; -import io.cordys.common.resolver.field.AbstractModuleFieldResolver; import io.cordys.crm.system.dto.field.RadioField; /** diff --git a/backend/crm/src/main/java/io/cordys/crm/clue/dto/request/ClueAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/clue/dto/request/ClueAddRequest.java index 1cdf35f9f..44ab2f04c 100644 --- a/backend/crm/src/main/java/io/cordys/crm/clue/dto/request/ClueAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/clue/dto/request/ClueAddRequest.java @@ -22,7 +22,6 @@ public class ClueAddRequest { @Schema(description = "客户名称") private String name; - @NotBlank @Size(max = 32) @Schema(description = "负责人") private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/clue/service/ClueService.java b/backend/crm/src/main/java/io/cordys/crm/clue/service/ClueService.java index 7b3acfec3..fa0ea341d 100644 --- a/backend/crm/src/main/java/io/cordys/crm/clue/service/ClueService.java +++ b/backend/crm/src/main/java/io/cordys/crm/clue/service/ClueService.java @@ -224,6 +224,9 @@ public class ClueService { clue.setId(IDGenerator.nextStr()); clue.setStage(ClueStatus.NEW.name()); clue.setInSharedPool(false); + if (StringUtils.isBlank(request.getOwner())) { + clue.setOwner(userId); + } // 校验名称重复 checkAddExist(clue); diff --git a/backend/crm/src/main/java/io/cordys/crm/customer/controller/CustomerFollowPlanController.java b/backend/crm/src/main/java/io/cordys/crm/customer/controller/CustomerFollowPlanController.java index e12a81a48..4503c4a43 100644 --- a/backend/crm/src/main/java/io/cordys/crm/customer/controller/CustomerFollowPlanController.java +++ b/backend/crm/src/main/java/io/cordys/crm/customer/controller/CustomerFollowPlanController.java @@ -1,10 +1,6 @@ package io.cordys.crm.customer.controller; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; import io.cordys.common.constants.PermissionConstants; -import io.cordys.common.pager.PageUtils; -import io.cordys.common.pager.Pager; import io.cordys.common.pager.PagerWithOption; import io.cordys.context.OrganizationContext; import io.cordys.crm.follow.domain.FollowUpPlan; diff --git a/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerAddRequest.java index 356503bd2..71fa43099 100644 --- a/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerAddRequest.java @@ -22,7 +22,6 @@ public class CustomerAddRequest { @Schema(description = "客户名称") private String name; - @NotBlank @Size(max = 32) @Schema(description = "负责人") private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerContactAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerContactAddRequest.java index 954423c7c..369e38863 100644 --- a/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerContactAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/customer/dto/request/CustomerContactAddRequest.java @@ -21,7 +21,6 @@ public class CustomerContactAddRequest { @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED) private String customerId; - @NotBlank @Size(max = 32) @Schema(description = "负责人") private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerContactService.java b/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerContactService.java index f1a26b809..4dad95b6f 100644 --- a/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerContactService.java +++ b/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerContactService.java @@ -203,6 +203,10 @@ public class CustomerContactService { customerContact.setOrganizationId(orgId); customerContact.setId(IDGenerator.nextStr()); customerContact.setEnable(true); + if (StringUtils.isBlank(request.getOwner())) { + customerContact.setOwner(userId); + } + // 校验名称重复 checkAddExist(customerContact); customerContactMapper.insert(customerContact); diff --git a/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerService.java b/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerService.java index e068a3441..a6d97ec69 100644 --- a/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerService.java +++ b/backend/crm/src/main/java/io/cordys/crm/customer/service/CustomerService.java @@ -249,6 +249,9 @@ public class CustomerService { customer.setOrganizationId(orgId); customer.setId(IDGenerator.nextStr()); customer.setInSharedPool(false); + if (StringUtils.isBlank(request.getOwner())) { + customer.setOwner(userId); + } // 校验名称重复 checkAddExist(customer); diff --git a/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpPlanAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpPlanAddRequest.java index d7ac4e55f..e304bbc1b 100644 --- a/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpPlanAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpPlanAddRequest.java @@ -33,7 +33,6 @@ public class FollowUpPlanAddRequest { private String content; @Size(max = 32) - @NotBlank @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED) private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpRecordAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpRecordAddRequest.java index 5f0bf01ab..7e2748fc9 100644 --- a/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpRecordAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/follow/dto/request/FollowUpRecordAddRequest.java @@ -36,7 +36,6 @@ public class FollowUpRecordAddRequest { private Long followTime; @Size(max = 32) - @NotBlank @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED) private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpPlanService.java b/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpPlanService.java index 664c6a440..40e20e0b3 100644 --- a/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpPlanService.java +++ b/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpPlanService.java @@ -33,6 +33,7 @@ import io.cordys.crm.system.service.ModuleFormCacheService; import io.cordys.crm.system.service.ModuleFormService; import io.cordys.mybatis.BaseMapper; import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,6 +81,9 @@ public class FollowUpPlanService extends BaseFollowUpService { followUpPlan.setCreateUser(userId); followUpPlan.setId(IDGenerator.nextStr()); followUpPlan.setOrganizationId(orgId); + if (StringUtils.isBlank(request.getOwner())) { + followUpPlan.setOwner(userId); + } followUpPlanMapper.insert(followUpPlan); //保存自定义字段 followUpPlanFieldService.saveModuleField(followUpPlan.getId(), orgId, userId, request.getModuleFields()); diff --git a/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpRecordService.java b/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpRecordService.java index 01062c46d..3f44d702a 100644 --- a/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpRecordService.java +++ b/backend/crm/src/main/java/io/cordys/crm/follow/service/FollowUpRecordService.java @@ -90,6 +90,9 @@ public class FollowUpRecordService extends BaseFollowUpService { followUpRecord.setCreateUser(userId); followUpRecord.setId(IDGenerator.nextStr()); followUpRecord.setOrganizationId(orgId); + if (StringUtils.isBlank(request.getOwner())) { + followUpRecord.setOwner(userId); + } followUpRecordMapper.insert(followUpRecord); //保存自定义字段 diff --git a/backend/crm/src/main/java/io/cordys/crm/opportunity/dto/request/OpportunityAddRequest.java b/backend/crm/src/main/java/io/cordys/crm/opportunity/dto/request/OpportunityAddRequest.java index 4166bf3ad..08275b77d 100644 --- a/backend/crm/src/main/java/io/cordys/crm/opportunity/dto/request/OpportunityAddRequest.java +++ b/backend/crm/src/main/java/io/cordys/crm/opportunity/dto/request/OpportunityAddRequest.java @@ -37,7 +37,6 @@ public class OpportunityAddRequest { private String contactId; @Size(max = 32) - @NotBlank @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED) private String owner; diff --git a/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityService.java b/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityService.java index ec0920f7c..de43f4b3e 100644 --- a/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityService.java +++ b/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityService.java @@ -195,6 +195,9 @@ public class OpportunityService { opportunity.setUpdateTime(System.currentTimeMillis()); opportunity.setUpdateUser(operatorId); opportunity.setStatus(true); + if (StringUtils.isBlank(request.getOwner())) { + opportunity.setOwner(operatorId); + } opportunityMapper.insert(opportunity); //自定义字段