From e8a050f2e5e9f868b16971b2facba4024d81abbe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 09:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 +++++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 11 +++++++----
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 13 +++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4 ++--
6 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index fd048af..64f3f6e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1685,7 +1685,7 @@
.selectAs(SystemUser::getMobile,UserRel::getUserPhone)
.selectAs(SystemUser::getOpenid,UserRel::getOpenid)
.leftJoin(SystemUser.class,SystemUser::getId,UserRel::getUserId)
- .eq(UserRel::getObjType, MeetConstants.ONE)
+// .eq(UserRel::getObjType, MeetConstants.ONE)
.eq(UserRel::getObjId, bookings.getId())
.eq(UserRel::getIsdeleted, MeetConstants.ZERO)
.isNotNull(SystemUser::getOpenid)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 0d52a93..0a045a9 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -260,6 +260,7 @@
.eq(SystemUser::getDeleted,Constants.ZERO)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
+ .leftJoin(" position p on p.id = t2.POSITION_ID ")
.and(StringUtils.isNotBlank(systemUser.getUsername()),ms->ms.like(SystemUser::getUsername,systemUser.getUsername())
.or().like(SystemUser::getMobile,systemUser.getUsername())
.or().like(SystemUser::getRealname,systemUser.getUsername()))
@@ -275,7 +276,8 @@
.like(StringUtils.isNotBlank(systemUser.getUsername()),SystemUser::getUsername,systemUser.getUsername())
.like(StringUtils.isNotBlank(systemUser.getCompanyName()),Company::getName,systemUser.getCompanyName())
.apply(StringUtils.isNotBlank(systemUser.getCompanySpecialId())," find_in_set('"+systemUser.getCompanySpecialId()+"',REPLACE(t1.company_path,'/',','))")
- .orderByAsc( Company::getPinyin )
+ .orderByAsc( Company::getSortnum )
+ .orderByAsc( " p.SORTNUM " )
.orderByAsc(SystemUser::getPinyin)
;
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, wrapper);
@@ -302,9 +304,12 @@
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SystemUser.class);
queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
- queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
- queryWrapper.eq(Company::getType,Constants.ONE);
- queryWrapper.orderByAsc(SystemUser::getPinyin);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .leftJoin(" position p on p.id = t2.POSITION_ID ");
+ queryWrapper.eq(Company::getType,Constants.ONE)
+ .orderByAsc( Company::getSortnum )
+ .orderByAsc( " p.SORTNUM " )
+ .orderByAsc(SystemUser::getPinyin);
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
return result;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 4e31dfa..61c123d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -295,7 +295,8 @@
String jsc = "jsc";//鐗╀笟鍚庡嫟
String kqgzt = "attendance_workstand";//鑰冨嫟绠＄悊
String kqdbcl = "process_apply";//鑰冨嫟浠ｅ姙澶勭悊
- String xfzx = "010200"; //娑堣垂涓績
+ String stxf = "010320"; //椋熷爞
+ String hqzx = "002656"; //鍚庡嫟涓績
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 820d0bd..0fc2d30 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1201,10 +1201,13 @@
componentId = HKConstants.MenuPageId.componentIds[1];
menuId = HKConstants.MenuPageId.kqdbcl;
}else if(Constants.equalsInteger(type,Constants.SIX)){
- //https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&componentId=cems&componentMenuId=010200
- return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
-// componentId = HKConstants.MenuPageId.componentIds[2];
-// menuId = HKConstants.MenuPageId.xfzx;
+ componentId = HKConstants.MenuPageId.componentIds[2];
+ menuId = HKConstants.MenuPageId.stxf;
+// return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
+ }else if(Constants.equalsInteger(type,7)){
+ menuId = HKConstants.MenuPageId.hqzx;
+ componentId = "";
+// return "https://10.50.250.253:443/portal/ui/index?menuId=002656&token="+token;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
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 2d2015e..b2edb5a 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
@@ -585,7 +585,7 @@
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
- queryWrapper.orderByAsc(Company::getPinyin);
+ queryWrapper.orderByAsc(Company::getSortnum);
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
@@ -615,7 +615,7 @@
wrapper.eq(Company::getIsdeleted,Constants.ZERO)
.eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type)
- .orderByAsc(Company::getPinyin);
+ .orderByAsc(Company::getSortnum);
List<Company> companies = companyMapper.selectList(wrapper);
return getCompanyTree( companies, null);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ea549ae..a83804f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1510,8 +1510,11 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
- .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
+
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
+// .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
@@ -1616,7 +1619,10 @@
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
- .orderByAsc(Member::getPinyin);
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+
+
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
--
Gitblit v1.9.3