From 757e5dc619ddf01fbd9ec2c8c75b6663d79835cb Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 11 五月 2021 14:10:55 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 3810161..3b4f250 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -518,6 +518,27 @@
if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
comPbMemberDO.setUpdateAt(new Date());
}
+
+ //编辑
+ if(partyBuildingMemberVO.getJoinTime()!=null) {
+ comPbMemberDO.setJoinTime(partyBuildingMemberVO.getJoinTime());
+ }
+ if(partyBuildingMemberVO.getEmploymentTime()!=null) {
+ comPbMemberDO.setEmploymentTime(partyBuildingMemberVO.getEmploymentTime());
+ }
+ if(partyBuildingMemberVO.getIdCard()!=null &&!partyBuildingMemberVO.getIdCard().contains("*")){
+ comPbMemberDO.setIdCard(partyBuildingMemberVO.getIdCard());
+ }
+ if(partyBuildingMemberVO.getName()!=null ){
+ comPbMemberDO.setName(partyBuildingMemberVO.getName());
+ }
+ if(partyBuildingMemberVO.getOrgId()!=null ){
+ comPbMemberDO.setOrgId(partyBuildingMemberVO.getOrgId());
+ }
+ if(partyBuildingMemberVO.getPhotoPath()!=null ){
+ comPbMemberDO.setPhotoPath(partyBuildingMemberVO.getPhotoPath());
+ }
+
if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();
BeanUtils.copyProperties(comPbMemberDO, rtVO);
--
Gitblit v1.7.1