productDev/funingyunwei.git

			@@ -108,6 +108,14 @@

			@Override
			public void deleteById(Integer id, LoginUserInfo user) {

			//查询客户信息下是否存在人员信息
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
			.eq(Member::getCustomerId,id)
			.eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在人员信息未删除，请先删除客户下人员信息!");
			}

			ywCustomerMapper.deleteById(id);
			}

			@@ -121,6 +129,11 @@
			public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
			.in(Member::getCustomerId,ids)
			.eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在人员信息未删除，请先删除客户下人员信息!");
			}
			ywCustomerMapper.deleteBatchIds(ids);
			}
			@@ -175,9 +188,16 @@
			}

			@Override
			public List<YwCustomer> findList(YwCustomer ywCustomer) {
			QueryWrapper<YwCustomer> wrapper = new QueryWrapper<>(ywCustomer);
			return ywCustomerMapper.selectList(wrapper);
			public List<YwCustomer> findList(YwCustomer model) {
			return ywCustomerMapper.selectJoinList(YwCustomer.class,
			new MPJLambdaWrapper<YwCustomer>()
			.selectAll(YwCustomer.class)
			.selectAs(Member::getName,YwCustomer::getMemberName)
			.selectAs(Member::getPhone,YwCustomer::getMemberPhone)
			.leftJoin(Member.class,Member::getId,YwCustomer::getMemberId)
			.eq(YwCustomer::getIsdeleted,Constants.ZERO)
			.like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),YwCustomer::getName,model.getName())
			.orderByDesc(YwCustomer::getCreateDate)) ;
			}

			@Override