From b99c3c47930374bb7dbb1a427b4b32f31b6172cd Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 09 五月 2024 13:39:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 1c46da2..f1c3d72 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -104,6 +104,7 @@
company.setIsdeleted(Constants.ZERO);
company.setHkStatus(Constants.ONE);
company.setStatus(Constants.ZERO);
+ company.setSortnum(0);//榛樿鏈�涓婇潰
company.setHkDate(company.getCreateDate());
company.setEditDate(company.getCreateDate());
company.setEditor(company.getCreator());
@@ -550,6 +551,7 @@
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
queryWrapper.eq(type!=null,Company::getType,type);
+ queryWrapper.orderByAsc(Company::getSortnum );
List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
//閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
--
Gitblit v1.9.3