java/zhihuishenqu.git

			@@ -172,7 +172,17 @@
			public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
			{
			List<OrganizationChartEntity> ids=new ArrayList<>();
			List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
			List<OrganizationChartEntity> lists=null;
			if(StringUtils.isEmpty(departmentId))
			{
			lists= iOrganizationChartService.selectParentList(null,"1");

			}
			else
			{
			lists= iOrganizationChartService.selectParentList(departmentId,null);
			}

			if(lists.size()<1)
			{
			lists.add(iOrganizationChartService.selectConfigById(departmentId));
			@@ -182,7 +192,12 @@
			{
			return null;
			}
			ids.add(iOrganizationChartService.selectConfigById(departmentId));

			if(!StringUtils.isEmpty(departmentId))
			{
			ids.add(iOrganizationChartService.selectConfigById(departmentId));
			}

			return getDataTable(ids);
			}

			@@ -85,7 +85,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 != ''">

			@@ -89,7 +89,6 @@
			<if test="parentId != null and parentId != ''">
			AND parent_id=#{parentId}
			</if>

			<if test="grade != null and grade != ''">
			AND grade=#{grade}
			</if>

	flower_city/src/main/java/com/dg/core/controller/OrganizationController.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/OrganizationChartMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史