productDev/dmvisit.git

			@@ -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;

			@@ -325,7 +325,6 @@
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织同步下发失败，请稍后重试");
			}
			}

			}

			@Override

			@@ -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())

			@@ -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;

	server/system_service/src/main/java/com/doumee/dao/business/model/Member.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史