Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -59,6 +59,7 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
                 UserEntity userEntity = userMap.get(item.getCreateUserId());
                 if(userEntity!=null) {
                     item.setPhotoPath(userEntity.getPhotoPath());
+                    item.setFeedbackName(userEntity.getRealName());
                 }
             }
         }

enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java

@@ -51,7 +51,7 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         this.addDict(model, "feedbackType", paramService.getParamBySecondOrganize("Feedback","feedbackType"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("Feedback","processStatus"));
 
-        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
+        this.addDict(model, "deptId", paramService.getParamBySecondOrganize("Feedback","deptId"));
 
 
         super.init(model, context);

enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java

@@ -73,8 +73,7 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
         this.addDict(model, "top", paramService.getParamBySecondOrganize("News", "top"));
         this.addDict(model, "viewNums", paramService.getParamBySecondOrganize("News", "viewNums"));
         this.addDict(model, "categoryId", newsCategoryService.find(new NewsCategoryQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
-        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
-
+        this.addDict(model, "deptId", paramService.getParamBySecondOrganize("News","deptId"));
         this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
 
         super.init(model, context);

enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

@@ -126,6 +126,10 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
                 if(StringUtils.isNotEmpty(item.getProductDetail())) {
                     item.setProductDetail(item.getProductDetail().replaceAll(regex, replacement));
                 }
+                String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).distinct().collect(Collectors.joining(","));
+                String companyIds = companyProductService.find(new CompanyProductQuery().productId(item.getId())).stream().map(i -> i.getCompanyId().toString()).distinct().collect(Collectors.joining(","));
+                item.setCompanyId(companyIds);
+                item.setCategoryId(categoryIds);
             });
         }
         return productEntityResult;
@@ -163,7 +167,17 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
 
     @Override
     protected void findAfter(ProductEntity params, PageInfo pageInfo, Context context, List<ProductEntity> list) throws AppException {
+        String regex = "src=\"file";
+        String replacement;
+        if(domain.endsWith("/")){
+            replacement = "src=\"" + domain + "file";
+        }else {
+            replacement = "src=\"" + domain + "/file";
+        }
         list.forEach(item -> {
+            if(StringUtils.isNotEmpty(item.getProductDetail())) {
+                item.setProductDetail(item.getProductDetail().replaceAll(regex, replacement));
+            }
             String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).distinct().collect(Collectors.joining(","));
             String companyIds = companyProductService.find(new CompanyProductQuery().productId(item.getId())).stream().map(i -> i.getCompanyId().toString()).distinct().collect(Collectors.joining(","));
             item.setCompanyId(companyIds);
@@ -307,6 +321,10 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
         List<ProductQuestionEntity> productQuestionlist = productQuestionService.find(new ProductQuestionQuery().productIdList(Arrays.asList(ids)));
         productQuestionService.removeList(productQuestionlist, context);
+        List<ProductCategoryEntity> productCategoryList = productCategoryService.find(new ProductCategoryQuery().productIdList(Arrays.asList(ids)));
+        productCategoryService.removeList(productCategoryList,context);
+        List<CompanyProductEntity> companyProductList = companyProductService.find(new CompanyProductQuery().productIdList(Arrays.asList(ids)));
+        companyProductService.removeList(companyProductList,context);
         super.removeAfter(ids, context, result);
     }