~admin/moral.git

			@@ -3,6 +3,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
			import com.moral.api.entity.Organization;
			import com.moral.api.mapper.OrganizationMapper;
			import com.moral.api.pojo.dto.organization.OrganizationDTO;
			@@ -15,11 +16,15 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.moral.constant.Constants;
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.util.ConvertUtils;
			import com.moral.util.DateUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.ObjectUtils;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			/**
			@@ -55,8 +60,8 @@
			existOrganization.setName(organization.getName());
			existOrganization.setIsDelete(Constants.NOT_DELETE);
			queryWrapper.setEntity(existOrganization);
			List<Organization> existOrganizations = organizationMapper.selectList(queryWrapper);
			if (!ObjectUtils.isEmpty(existOrganizations)) {
			Organization existOrganizationResult = organizationMapper.selectOne(queryWrapper);
			if (!ObjectUtils.isEmpty(existOrganizationResult)) {
			organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_EXIST.getCode());
			organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST.getMsg());
			return organizationDTO;
			@@ -98,6 +103,7 @@
			OrganizationDTO organizationDTO = new OrganizationDTO();
			//form转entity
			Organization organization = organizationUpdateForm.formConvertEntity();

			//查询组织是否存在
			QueryWrapper<Organization> existWrapper = new QueryWrapper<>();
			Organization existOrganization = new Organization();
			@@ -110,6 +116,7 @@
			organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
			return organizationDTO;
			}

			//如果更改了父组织，查询父组织是否存在
			Integer parentId = organization.getParentId();
			Organization parentOrganization = new Organization();
			@@ -125,8 +132,10 @@
			return organizationDTO;
			}
			}

			//更新组织
			organizationMapper.updateById(organization);

			//获取更新后的组合
			organization = organizationMapper.selectById(organization.getId());

			@@ -198,16 +207,80 @@
			public OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm) {
			OrganizationQueryDTO dto = new OrganizationQueryDTO();
			//取参
			Organization organization = organizationQueryForm.formConvertEntity();
			Integer pageCount = organizationQueryForm.getPage();
			Integer size = organizationQueryForm.getSize();
			Integer parentId = organizationQueryForm.getParentId();
			String name = organizationQueryForm.getName();
			Integer provinceCode = organizationQueryForm.getProvinceCode();
			Integer cityCode = organizationQueryForm.getCityCode();
			Integer areaCode = organizationQueryForm.getAreaCode();
			Long townCode = organizationQueryForm.getTownCode();
			Long villageCode = organizationQueryForm.getVillageCode();
			String phone = organizationQueryForm.getPhone();
			String email = organizationQueryForm.getEmail();
			String wechat = organizationQueryForm.getWechat();
			String isDelete = organizationQueryForm.getIsDelete();
			String order = organizationQueryForm.getOrder();
			String orderType = organizationQueryForm.getOrderType();
			Date createStartTime = organizationQueryForm.getCreateStartTime();
			Date createEndTime = DateUtils.getDateOfDay(organizationQueryForm.getCreateEndTime(), 1);
			Date expireStartTime = organizationQueryForm.getExpireStartTime();
			Date expireEndTime = DateUtils.getDateOfDay(organizationQueryForm.getExpireEndTime(), 1);

			//查询用户
			//查询条件
			Page<Organization> page = new Page<>(pageCount,size);
			QueryWrapper<Organization> queryWrapper = new QueryWrapper<>();
			return null;
			NullFilterWrapper<Organization> queryWrapper = new NullFilterWrapper<>();

			queryWrapper.eq("parent_id", parentId);
			queryWrapper.like("name", name);
			queryWrapper.eq("province_code", provinceCode);
			queryWrapper.eq("city_code", cityCode);
			queryWrapper.eq("area_code", areaCode);
			queryWrapper.eq("town_code", townCode);
			queryWrapper.eq("village_code", villageCode);
			queryWrapper.like("phone", phone);
			queryWrapper.like("email", email);
			queryWrapper.like("wechat", wechat);
			queryWrapper.between("create_time", createStartTime, createEndTime);
			queryWrapper.between("expire_time", expireStartTime, expireEndTime);

			if (!ObjectUtils.isEmpty(isDelete)) {
			queryWrapper.eq("is_delete", isDelete);
			} else {
			queryWrapper.eq("is_delete", Constants.NOT_DELETE);
			}

			//排序顺序
			if (!ObjectUtils.isEmpty(order)) {
			if (!ObjectUtils.isEmpty(orderType)) {
			if (orderType.equals(Constants.ORDER_ASC))
			queryWrapper.orderByAsc(ConvertUtils.toLine(order));
			else
			queryWrapper.orderByDesc(ConvertUtils.toLine(order));
			}
			}

			//查询结果
			Page<Organization> resultPage = organizationMapper.selectPage(page, queryWrapper);
			List<Organization> organizations = resultPage.getRecords();
			List<OrganizationDTO> organizationDTOS = new ArrayList<>();
			//查找所有组织的父组织
			for (Organization child : organizations) {
			OrganizationDTO resultDto = new OrganizationDTO();
			Organization parent = organizationMapper.selectById(child.getParentId());
			resultDto.setOrganization(child);
			resultDto.setParentOrganization(parent);
			organizationDTOS.add(resultDto);
			}

			dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
			dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			dto.setOrganizationDTOS(organizationDTOS);
			dto.setCurrent(page.getCurrent());
			dto.setPage(page.getPages());
			dto.setSize(page.getSize());
			dto.setTotal(page.getTotal());
			return dto;
			}