flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -54,7 +54,7 @@ @Authorization public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser) { return getOrganizations(sysUser.getDepartmentId()); return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null)); } /** flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -6,6 +6,7 @@ import com.dg.core.db.gen.entity.OrganizationChartEntity; import com.dg.core.db.gen.mapper.OrganizationChartMapper; import com.dg.core.service.IOrganizationChartService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -19,11 +20,18 @@ @Override public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids) { List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1",ids); List<OrganizationChartEntity> ocList=baseMapper.selectConfigList(parentId,"1",ids); if(ocList==null || ocList.size()<1) { List<String> id=new ArrayList<>(); id.add(parentId); ocList=baseMapper.selectConfigList(null,null,id); } for (OrganizationChartEntity entity:ocList) { entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",ids)); entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",null)); if (entity.getChild()!=null) { flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -110,7 +110,7 @@ <if test="matterName != null and matterName != ''"> AND (matter_name like concat('%', #{matterName}, '%')) or ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) ) or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id= or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%'))) ) </if> <if test="status != null and status != ''">
