地图 更新

fengxiang

2018-09-25 7fb0113fb5bcb16d6e2930ba41020aff9c088be0

 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -40,7 +40,7 @@
       if (IS_DELETE_FALSE.equals(organization.getIsDelete())) {

          List<OrganizationRelation> organizationRelations = organizationRelationMapper.select(relation);

          for (OrganizationRelation organizationRelation : organizationRelations) {

             Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getParentId());

             Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getChildId());

             orgIds.addAll(organizationIds);

          }

      }

@@ -65,10 +65,16 @@
      }else {

         example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

      }

      PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

      if(pageBean.getPageSize()>0){

         PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

      }

      if(example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {

         example.setOrderByClause("create_time desc");

      }

      List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);

      return new PageBean(organizationList);

   }

   @Override

   public void addOrModify(Organization organization){

      try{

         if(organization.getId()==null){

@@ -76,7 +82,7 @@
            organization.setIsDelete(Constants.IS_DELETE_FALSE);

            organizationMapper.insertSelective(organization);

         }else{

            organizationMapper.updateByPrimaryKeySelective(organization);

            organizationMapper.updateByPrimaryKey(organization);

         }

      }

      catch (Exception ex){

@@ -103,12 +109,22 @@
   

   @Override

   public List<Organization> getOrganizationsByName(String name) {

      ValidateUtil.notEmpty(name, "param.is.null");

      Example example = new Example(Organization.class);

      Criteria criteria = example.createCriteria();

      criteria.andLike("name", "%" + name + "%");

      criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);



      criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");

      example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");



      List<Organization> organizations = organizationMapper.selectByExample(example);

      return organizations;

   }



   @Override

   public Organization getOrganizationById(int id) {

       Example example = new Example(ENTITY_CLASS);

       example.or().andEqualTo("id",id);

       List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);

      return organizationList.size()>0?organizationList.get(0):null;

   }

}