组织机构增加获取生效中的组织机构

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasOrganizationDaoImpl.java

@@ -168,7 +168,8 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
 
 	public List<KObject> queryAllOrganization() {
 		return template.execute(session -> {
-			Query<KObject> query = session.createQuery(" from " + ORGANIZATION_ENTITY + " as f ", KObject.class);
+			Query<KObject> query = session.createQuery(" from " + ORGANIZATION_ENTITY + " as f where (discard is null or discard = 0) and type=:type", KObject.class);
+			query.setParameter("type", "REGIONAL_COMPANY");
 			return query.getResultList();
 		});
 	}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/DinasOrganizationServiceImpl.java

@@ -144,4 +144,9 @@ public class DinasOrganizationServiceImpl implements DinasOrganizationService {
 	public KObject getOneRegionalCompany() {
 		return dinasOrganizationDao.queryOneRegionalCompany();
 	}
+
+	@Override
+	public Object getAllEnabledRegionalCompany() {
+		return dinasOrganizationDao.queryAllOrganization();
+	}
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/DinasOrganizationService.java

@@ -17,6 +17,8 @@ public interface DinasOrganizationService {
 	KObject load(UUID id);
 	
 	KObject getOneRegionalCompany();
+	
+	Object getAllEnabledRegionalCompany();
 
 	List<UUID> queryStaffByPostId(String postId);
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasOrganizationController.java

@@ -44,6 +44,17 @@ public class DinasOrganizationController {
 		 return dinasOrganizationService.getOneRegionalCompany();
     }
 	
+	/**
+	 * 查询所有生效的区域公司
+	 * @param id
+	 * @return
+	 */
+	@ResponseBody
+    @RequestMapping(value = "/dinasBiz/organization/getAllEnabledRegionalCompany", method = RequestMethod.GET)
+    public Object getAllEnabledRegionalCompany() {
+		 return dinasOrganizationService.getAllEnabledRegionalCompany();
+    }
+	
 	/**  
 	 * @Description: 查询区域公司下的所有人
 	 * @param id