From 7e4cb4eeca9f5f9d6d0e38adaf0522f2473d767f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 01 十一月 2024 15:22:48 +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/MemberServiceImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 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 fcc146f..72dbddb 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 @@ -211,6 +211,9 @@ insert.setHkId(UUID.randomUUID().toString().replace("-","")); insert.setHkStatus(Constants.ONE); insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆 + insert.setJobDate(member.getJobDate()); + insert.setIsDangyuan(member.getIsDangyuan()); + insert.setPositionId(member.getPositionId()); if(StringUtils.isNotBlank(member.getIdcardNo())){ insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo()))); insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑 @@ -1144,7 +1147,7 @@ if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){ String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode(); if(StringUtils.isNotBlank(companySpecialId)){ - queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t2.company_path,'/','')) "); + queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) "); } } queryWrapper.eq(Member::getIsdeleted,Constants.ZERO); -- Gitblit v1.9.3