java/zhihuishenqu.git

			@@ -127,6 +127,7 @@
			@ApiOperation(value = "编辑群团组织成员")
			@PostMapping("/member/edit")
			public R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto) {
			editClusterMemberAdminDto.setCommunityId(this.getCommunityId());
			return communityService.editClusterMemberAdmin(editClusterMemberAdminDto);
			}

			@@ -223,7 +223,7 @@
			}

			//判断民族是否存在
			if(!isOnly(memberExcel.getNation(),nationMap)){
			if(isOnly(memberExcel.getNation(),nationMap)){
			ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
			BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
			memberExcelErrorVO.setError("您填写的民族不存在");

			@@ -14,6 +14,7 @@

			import javax.annotation.Resource;

			import cn.hutool.core.util.IdcardUtil;
			import com.panzhihua.service_user.dao.*;
			import com.panzhihua.service_user.model.dos.*;
			import org.apache.commons.lang.time.DateFormatUtils;
			@@ -781,7 +782,7 @@
			sysUserDO.setIdCard(idCard);
			// 通过身份证号判断性别以及出生日期
			sysUserDO.setSex(IdCard.sex(idCard));
			sysUserDO.setBirthday(IdCard.birthDay(idCard));
			sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
			if (!StringUtils.isEmpty(loginUserInfoVO.getJob())) {
			sysUserDO.setJob(loginUserInfoVO.getJob());
			}

	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ClusterApi.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史