From a71874bb31fc0ca16c81ebcd6ef9bd9d27dec030 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 01 十二月 2025 09:12:27 +0800
Subject: [PATCH] 功能开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
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 4ecfa18..cdc2091 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
@@ -175,7 +175,7 @@
Member insert = initAddMemberModel(member,loginUserInfo);
//娴峰悍浜哄憳鏂板涓氬姟
try {
- if(dealHkUserBiz(insert)){
+// if(dealHkUserBiz(insert)){
memberMapper.insert(insert);
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
@@ -184,9 +184,9 @@
//澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
dealTrainTIme(member,0,loginUserInfo);
// }
- }else{
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
- }
+// }else{
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+// }
}catch (BusinessException e){
//濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
deleteHkUserBiz(new String[]{insert.getHkId()});
@@ -199,6 +199,7 @@
}
return insert;
}
+
public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) {
SystemUser user = new SystemUser();
// 鐢熸垚瀵嗙爜鐩�
@@ -397,9 +398,9 @@
if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
- if(StringUtils.isBlank(company.getHkId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
- }
+// if(StringUtils.isBlank(company.getHkId())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+// }
member.setHkOrgId(company.getHkId());
member.setCompanyType(company.getType());
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
@@ -1555,7 +1556,8 @@
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
.orderByAsc(Company::getSortnum)
- .orderByAsc(Position::getSortnum);
+ .orderByAsc(Position::getSortnum)
+ .orderByAsc(Member::getId);
// .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){
--
Gitblit v1.9.3