diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 573825ac0..7389783da 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -590,7 +590,7 @@ public class AppUserServiceImpl implements AppUserService { user.setPartyFlag(formDto.getPartFlag() == null ? YesOrNoEnum.NO.value() : String.valueOf(formDto.getPartFlag())); user.setRegisterWay(AppUserRegisterWayEnum.WX.value()); user.setRegisterSource(AppUserRegisterSourceEnum.WP.value()); - user.setFaceImg(USER_FACE); +// user.setFaceImg(USER_FACE); return user; } @@ -1701,6 +1701,9 @@ public class AppUserServiceImpl implements AppUserService { userDTO.setWorkType(formDto.getWorkType()); userDTO.setWorkIndustry(formDto.getWorkIndustry()); userDTO.setWorkIndustryText(formDto.getWorkIndustryText()); + if(StringUtils.isNotEmpty(formDto.getFaceImg())){ + userDTO.setFaceImg(formDto.getFaceImg()); + } // IP地址 HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); userDTO.setLastLoginIp(IpUtils.getIpAddr(request)); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java index 9c1aa7be1..8b39486ae 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java @@ -90,11 +90,13 @@ public class ReportPartyServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name); wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard); wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile); + wrapper.like(StringUtils.isNotBlank(workUnit), "WORK_UNIT", workUnit); wrapper.likeLeft(StringUtils.isNotBlank(deptId), "PARENT_DEPT_IDS", deptId); return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java index 9f5dc15b3..f2d87d810 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java @@ -119,6 +119,11 @@ public class UserDjylServiceImpl extends BaseServiceImpl