From 4f8b83178eabea113df2ea48b64a56cb7f721107 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 08 四月 2025 14:55:42 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ---- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1 + server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 5 ----- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 1 - 4 files changed, 1 insertions(+), 10 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java index 329c600..9c60826 100644 --- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java +++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java @@ -253,7 +253,6 @@ @ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true ) @TableField(exist = false) private Integer timeType; - //鏆傛棤浣跨敤 @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿") @TableField(exist = false) private String keyword; @@ -281,19 +280,15 @@ @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1") @TableField(exist = false) private Integer headStatus; - - @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О") @TableField(exist = false) private String roleName; @ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�") @TableField(exist = false) private String optRemark; - @ApiModelProperty(value = "system openid" , hidden = true) @TableField(exist = false) private String systemOpenid; - @ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�") @TableField(exist = false) private Date trainStartTime; diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java index 5bf29d4..969cee4 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java @@ -325,7 +325,6 @@ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯"); } } - } @Override 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 6f0f506..88c1d1e 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 @@ -579,7 +579,6 @@ trainTimeMapper.insert(trainTime);*/ return insert.getId(); } - @Override @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void deleteById(Integer id,LoginUserInfo loginUserInfo) { @@ -628,8 +627,6 @@ } } } - - @Override public void roleAuthById(Integer id,LoginUserInfo user) { Member member = memberMapper.selectById(id); @@ -698,7 +695,6 @@ memberRole.setStartTime(trainTime.getStartTime()); memberRole.setEndTime(trainTime.getEndTime()); } - memberMapper.update(null,new UpdateWrapper<Member>().lambda() .eq(Member::getId,member.getId()) .set(Member::getRoleId,member.getRoleId()) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java index b88c838..ec27f56 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java @@ -31,6 +31,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.net.ftp.FTP; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -- Gitblit v1.9.3