|
@@ -48,9 +48,12 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
|
|
|
*/
|
|
|
public ProductServiceDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
|
|
|
ProductServiceDTO productServiceDTO = new ProductServiceDTO();
|
|
|
- Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
|
|
|
+ Long operatorId = Long.parseLong(UserUtils.getCurrentPrincipleID());
|
|
|
+ Long userId = null;
|
|
|
if (null != productServiceSaveVO.getUserId()){
|
|
|
userId = productServiceSaveVO.getUserId();
|
|
|
+ } else {
|
|
|
+ userId = operatorId;
|
|
|
}
|
|
|
LantoneProduct lantoneProduct = lantoneProductFacade.getById(productServiceSaveVO.getProductId());
|
|
|
if (lantoneProduct == null) {
|
|
@@ -75,11 +78,11 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
|
|
|
productService = new ProductService();
|
|
|
productService.setProductId(productServiceSaveVO.getProductId());
|
|
|
productService.setServiceId(productServiceSaveVO.getServiceId());
|
|
|
- productService.setCreator(userId.toString());
|
|
|
+ productService.setCreator(operatorId.toString());
|
|
|
productService.setGmtCreate(new Date());
|
|
|
this.save(productService);
|
|
|
} else {
|
|
|
- productService.setModifier(userId.toString());
|
|
|
+ productService.setModifier(operatorId.toString());
|
|
|
productService.setGmtModified(new Date());
|
|
|
this.updateById(productService);
|
|
|
}
|
|
@@ -94,7 +97,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
|
|
|
}
|
|
|
|
|
|
ServiceToken serviceToken = new ServiceToken();
|
|
|
- serviceToken.setCreator(userId.toString());
|
|
|
+ serviceToken.setCreator(operatorId.toString());
|
|
|
serviceToken.setGmtCreate(new Date());
|
|
|
serviceToken.setProductServiceId(productService.getId());
|
|
|
serviceToken.setType(productServiceSaveVO.getType());
|