productDev/funingyunwei.git

			@@ -67,6 +67,7 @@
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public Integer create(Company company) {
			company.setType(Constants.ONE);
			if(StringUtils.isBlank(company.getName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			@@ -120,9 +121,9 @@
			company.setHkId(UUID.randomUUID().toString().replace("-",""));
			companyMapper.insert(company);
			//下发海康安防平台
			if(!addHkOrg(company)){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织同步下发失败，请稍后重试");
			}
			// if(!addHkOrg(company)){
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织同步下发失败，请稍后重试");
			// }
			Company com = new Company();
			com.setId(company.getId());
			com.setCompanyPath(idPath+company.getId()+"/");
			@@ -243,9 +244,9 @@
			company.setHkDate(company.getHkDate());
			companyMapper.updateById(company);
			//下发海康安防平台
			if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织删除下发失败，请确认该组织无下级组织或组织人员信息~");
			}
			// if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织删除下发失败，请确认该组织无下级组织或组织人员信息~");
			// }
			}

			@Override

			@@ -141,7 +141,7 @@
			Member insert = initAddMemberModel(member,loginUserInfo);
			//海康人员新增业务
			try {
			if(dealHkUserBiz(insert)){
			// if(dealHkUserBiz(insert)){
			memberMapper.insert(insert);
			//创建系统登陆账号（默认无任何角色）
			// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
			@@ -150,13 +150,13 @@
			//处理培训有效期业务
			dealTrainTIme(member,0,loginUserInfo);
			// }
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			}
			// }else{
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			// }
			}catch (Exception e){
			//如果发生异常，删除已经创建的人员信息
			e.printStackTrace();
			deleteHkUserBiz(new String[]{insert.getHkId()});
			// deleteHkUserBiz(new String[]{insert.getHkId()});
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
			}
			return insert;
			@@ -568,8 +568,8 @@
			member.setIsdeleted(Constants.ONE);
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setHkStatus(Constants.ZERO);
			member.setRemark("人员已删除，等待删除门禁权限");
			// member.setHkStatus(Constants.ZERO);
			// member.setRemark("人员已删除，等待删除门禁权限");
			memberMapper.updateById(member);

			//刪除系统登陆账户
			@@ -891,7 +891,7 @@
			updateMember.setEditor(loginUserInfo.getId());
			updateMember.setEditDate(new Date());
			//海康人员新增业务
			if(dealHkUserForUpdateBiz(updateMember)){
			// if(dealHkUserForUpdateBiz(updateMember)){
			updateMember.setHkId(null);
			updateMember.setAuthStatus(Constants.ZERO);
			memberMapper.update(null,new UpdateWrapper<Member>().lambda()
			@@ -923,9 +923,9 @@
			cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
			//记录操作日志
			saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			}
			// }else{
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			// }
			}

			private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {

	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史