From 2ae3ac8e15e3e831701673d1edcb3c11482e2a95 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 23 Aug 2023 15:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 5 ++++-
 .../esua/epdc/party/service/impl/ReportPartyServiceImpl.java | 2 ++
 .../esua/epdc/user/service/impl/UserDjylServiceImpl.java     | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

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<ReportPartyDao, Repo
         String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
         String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
         String deptId = (String) params.get("deptId");
+        String workUnit = (String) params.get("workUnit");
         QueryWrapper<ReportPartyEntity> 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<UserDjylDao, UserDjylEn
 
         UserDjylEntity entity = ConvertUtils.sourceToTarget(userDto, UserDjylEntity.class);
         entity.setId(userDto.getUserId());
+        if (StringUtils.isNotEmpty(userDto.getFaceImg())) {
+            entity.setFaceImg(userDto.getFaceImg());
+        } else {
+            entity.setFaceImg(null);
+        }
         baseDao.updateById(entity);
 
         UserGridRelationEntity entity1 = new UserGridRelationEntity();