diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java index ea1f64b27..91a08e941 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java @@ -79,7 +79,7 @@ public class ProductUserReqInputVo { record.setProductRequirementId(pmsProductRequirement.getId()); record.setType(ProductReqOperationType.CONTENT_MODIFY.getKey()); record.setOperation(ProductContentModifyOperation.CREATE.getKey()); - record.setOperator(pmsProductRequirement.getCreateBy()); + record.setOperator(pmsProductRequirement.getCreateBy().isEmpty() ? pmsProductRequirement.getSourceUser() : pmsProductRequirement.getCreateBy()); record.setOperatingTime(pmsProductRequirement.getCreateTime()); return record; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductService.java index 792001a6c..601750424 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductService.java @@ -56,6 +56,8 @@ public interface IPmsProductService */ public int updatePmsProductChange(String productIdentifier); + int updatePmsProductChangeWithoutAuth(String productIdentifier); + /** * 批量删除产品 * diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java index 878fb75a0..37cb94c17 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java @@ -167,7 +167,7 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS pmsProductRequirement.setCreateAndUpdate(SecurityUtils.getUsername()); - pmsProductService.updatePmsProductChange(pmsProductRequirement.getPmsProductIdentifier()); + pmsProductService.updatePmsProductChangeWithoutAuth(pmsProductRequirement.getPmsProductIdentifier()); pmsProductRequirementMapper.insertPmsProductRequirement(pmsProductRequirement); pmsProductReqOperationRecordService.insertPmsProductReqOperationRecord( productUserReqInputVo.toPmsProductReqOperationRecord(pmsProductRequirement)); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductServiceImpl.java index 4b7041301..d4b32f1bd 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductServiceImpl.java @@ -223,6 +223,14 @@ public class PmsProductServiceImpl implements IPmsProductService return pmsProductMapper.updatePmsProduct(pmsProduct); } + @Override + public int updatePmsProductChangeWithoutAuth(String productIdentifier) { + PmsProduct pmsProduct = selectPmsProductByIdentifierWithoutAuth(productIdentifier); + pmsProduct.setUpdateBy(SecurityUtils.getUsername()); + pmsProduct.setUpdateTime(DateUtils.getNowDate()); + return pmsProductMapper.updatePmsProduct(pmsProduct); + } + /** * 批量删除产品 *