From e23b94bb04b0e5dbc4912add143cf1bf472c70f5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 17:47:43 +0800
Subject: [PATCH] 基础字段
---
server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index a51db4a..233aebf 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -131,6 +131,7 @@
category.setCreateDate(new Date());
category.setCreator(user.getId());
category.setIsdeleted(Constants.ZERO);
+ category.setCompanyId(user.getCompanyId());
//澶勭悊鎷奸煶闂
category.setPinyin(PinYinUtil.getFullSpell(category.getName()));
category.setShortPinyin(PinYinUtil.getFirstSpell(category.getName()));
@@ -393,13 +394,11 @@
@Override
public Category findById(Integer id) {
Category category = categoryMapper.selectById(id);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
category.setPrefixUrl(prefixUrl);
category.setParamList(cateParamMapper.selectList(new QueryWrapper<CateParam>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
- category.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
- category.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
- category.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
+ category.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
return category;
}
@@ -461,10 +460,13 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.lambda().eq(Category::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
queryWrapper.lambda().orderByAsc(Category::getSortnum);
IPage<Category> categoryIPage = categoryMapper.selectPage(page, queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
categoryIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
});
--
Gitblit v1.9.3