소스 검색

修复用户在线服务加入复问题

gaodm 6 년 전
부모
커밋
3d719aeb7d

+ 7 - 4
diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -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());

+ 5 - 2
diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -35,9 +35,12 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
      * @return
      */
     public ServiceInfo createService(ServiceSaveVO serviceSaveVO) {
-        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        Long operatorId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        Long userId = null;
         if (null != serviceSaveVO.getUserId()){
             userId = serviceSaveVO.getUserId();
+        } else {
+            userId = operatorId;
         }
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
         qw.eq("name", serviceSaveVO.getName()).
@@ -53,7 +56,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         serviceInfo.setDescription(serviceSaveVO.getDescription());
         serviceInfo.setType(serviceSaveVO.getType());
         serviceInfo.setUserId(userId);
-        serviceInfo.setCreator(userId.toString());
+        serviceInfo.setCreator(operatorId.toString());
         serviceInfo.setGmtCreate(new Date());
         this.save(serviceInfo);
         return serviceInfo;