From acf90ad8e6bea592124541324467360cef565ff5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 二月 2026 14:14:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 6f231e7..bc617e2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -215,6 +215,8 @@
public List<Category> findList(Category category) {
category.setDeleted(Constants.ZERO);
QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
+ wrapper.lambda().orderByAsc(Category::getSortnum);
+ wrapper.lambda().orderByAsc(Category::getId);
return categoryMapper.selectList(wrapper);
}
@@ -338,7 +340,11 @@
public void syncZhanQu() throws IOException {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPass iPass = new IPass();
- List<ZhanQuVO> l = iPass.getIPassZhanquList();
+ List<ZhanQuVO> l = iPass.getIPassZhanquList(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IPASS_LOGIN_ACCOUNT).getCode(),
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IPASS_LOGIN_PSD).getCode(),
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IPASS_TOKEN_URL).getCode(),
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IPASS_ZHANQU_URL).getCode()
+ );
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getType,Constants.ZERO)
.eq(Category::getDeleted,Constants.ZERO)
@@ -367,11 +373,11 @@
public Category vaildData(ZhanQuVO zhanQuVO , List<Category> categoryList, LoginUserInfo userInfo) {
Category returnData = new Category();
for (Category category:categoryList) {
+ returnData.setUpdateUser(userInfo.getId());
+ returnData.setUpdateTime(new Date());
if(category.getDetail().equals(zhanQuVO.getNodeCode())){
returnData = category ;
returnData.setName(zhanQuVO.getNodeName());
- returnData.setUpdateUser(userInfo.getId());
- returnData.setUpdateTime(new Date());
return returnData;
}
}
--
Gitblit v1.9.3