From 0f18ff51b0da283c6d9079a145bf1640049fbc95 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:02:39 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 55 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 3584cca..df2d4f3 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
@@ -182,19 +182,18 @@
Member insert = initAddMemberModel(member,loginUserInfo);
//娴峰悍浜哄憳鏂板涓氬姟
try {
- if(dealHkUserBiz(insert)){
- insert.setHkStatus(Constants.ONE);
- memberMapper.insert(insert);
- //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
- // if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
- //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
- systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
- //澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
- dealTrainTIme(member,0,loginUserInfo);
+// if(dealHkUserBiz(insert)){
+ memberMapper.insert(insert);
+ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
+ systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
+ //澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
+ 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()});
@@ -258,7 +257,7 @@
insert.setCanVisit(Constants.formatIntegerNum(member.getCanVisit()));//榛樿涓嶅彲璁块棶
insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
-// insert.setHkId(UUID.randomUUID().toString().replace("-",""));
+ insert.setHkId(UUID.randomUUID().toString().replace("-",""));
insert.setHkStatus(Constants.ZERO);
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
insert.setJobDate(member.getJobDate());
@@ -402,7 +401,7 @@
.eq(Member::getIsdeleted,Constants.ZERO) ) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
- Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
+ Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紒");
}
@@ -506,7 +505,7 @@
}
if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
//濡傛灉缁勭粐鍙戠敓鍙樺寲
- Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
+ Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
@@ -969,44 +968,44 @@
updateMember.setEditor(loginUserInfo!=null?loginUserInfo.getId():null);
updateMember.setEditDate(new Date());
//娴峰悍浜哄憳鏂板涓氬姟
- if(dealHkUserForUpdateBiz(updateMember)){
- updateMember.setHkStatus(Constants.ONE);
- updateMember.setHkId(null);
- updateMember.setAuthStatus(Constants.ZERO);
- memberMapper.update(null,new UpdateWrapper<Member>().lambda()
- .set(Member::getStartTime,null)
- .set(Member::getEndTime,null)
- .set(Member::getRoleId,null)
- .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
- .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
- .set(Member::getEditDate,updateMember.getEditDate())
- .set(Member::getEditor,updateMember.getEditor())
- .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
- .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
- .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
- .set( Member::getAuthStatus,Constants.ZERO)
- .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
- .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
- .set(updateMember.getCanVisit()!=null,Member::getCanVisit,updateMember.getCanVisit())
- .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
- .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
- .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
- .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
- .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
- .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
- .set(Member::getCode,updateMember.getCode())
- // .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
- .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
- .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
- .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
- .eq(Member::getId,updateMember.getId()));
- dealTrainTIme(updateMember,1,loginUserInfo);
- cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
- //璁板綍鎿嶄綔鏃ュ織
- saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
- }else{
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
- }
+// if(dealHkUserForUpdateBiz(updateMember)){
+ updateMember.setHkId(null);
+ updateMember.setAuthStatus(Constants.ZERO);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getStartTime,null)
+ .set(Member::getEndTime,null)
+ .set(Member::getRoleId,null)
+ .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
+ .set(Member::getEditDate,updateMember.getEditDate())
+ .set(Member::getEditor,updateMember.getEditor())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
+ .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+ .set( Member::getAuthStatus,Constants.ZERO)
+ .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+ .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+ .set(updateMember.getCanVisit()!=null,Member::getCanVisit,updateMember.getCanVisit())
+ .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
+ .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+ .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+ .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
+ .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
+ .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
+ .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
+ .set(Member::getCode,updateMember.getCode())
+// .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
+ .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
+ .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
+ .eq(Member::getId,updateMember.getId()));
+ dealTrainTIme(updateMember,1,loginUserInfo);
+ cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
+// }else{
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+// }
}
private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {
@@ -2571,7 +2570,7 @@
if(depart!=null){
member.setCompanyId(depart.getId());
}
- member.setCompanyModel(depart);
+ member.setCompany(depart);
return member;
}
@@ -2609,7 +2608,7 @@
@Override
public String syncJdyUserInfo() {
- DeptApiClient deptApiClient = new DeptApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.API_KEY).getCode(), HttpConstant.HOST);
+ DeptApiClient deptApiClient = new DeptApiClient(HttpConstant.API_KEY, HttpConstant.HOST);
try {
Map<String, Object> result = deptApiClient.deptMemberList(1,true,deptApiClient.getDefaultVersion());
if(result!=null && result.get("users")!=null ){
--
Gitblit v1.9.3