diff --git a/.settings/com.genuitec.eclipse.migration.prefs b/.settings/com.genuitec.eclipse.migration.prefs new file mode 100644 index 00000000..1abe59d3 --- /dev/null +++ b/.settings/com.genuitec.eclipse.migration.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +performed.operation.me.create.deploymentAssembly=1.0 +performed.operation.me.create.deploymentAssembly.fixBuildPathEntries=1.0 +performed.operation.me.install.jstl=1.0 +performed.operation.me.install.springfacet=1.0 +performed.operation.me.migrate.hibernatenature=1.0 +performed.operation.me.migrate.jsnature=1.0 +performed.operation.migrate.container.ids=1.0 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 00000000..48a105b2 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.springBeans b/.springBeans new file mode 100644 index 00000000..1ee4f645 --- /dev/null +++ b/.springBeans @@ -0,0 +1,14 @@ + + + 1 + + + + + + + + + + 1.2 + diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class index a96ef5a5..ede440a6 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class index f5eaefdd..e6bbc033 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class index 82baf7bd..5852e80a 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class index 36bcafaa..31d17bf2 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class index 46a05653..a53099c9 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class index 74f6900f..3f6d2d53 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class index 98ef4a84..b945f526 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class index cbb8c04c..40178ed8 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class index 1aa80e9a..1c3dcddc 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class index ae9c4e40..94647062 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class index 91a845f0..d2793557 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class index 052fe1af..0025cb62 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class index dccc1124..082e2805 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class index b5f71076..74619d18 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class index 9926e0cf..f2b34296 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class index be1b082c..8ca33420 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class index 0eef1eae..ccea8af8 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class index c03188b0..b07e87bf 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class index 174ae52d..7ffc38a8 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class b/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class index 0a2f1675..d128c60f 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class and b/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/base/BaseIDAO.class b/WebRoot/WEB-INF/classes/com/jsh/base/BaseIDAO.class index 11d1159a..fe921bd8 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/base/BaseIDAO.class and b/WebRoot/WEB-INF/classes/com/jsh/base/BaseIDAO.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/base/Log.class b/WebRoot/WEB-INF/classes/com/jsh/base/Log.class index 95609348..8c61cdde 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/base/Log.class and b/WebRoot/WEB-INF/classes/com/jsh/base/Log.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class index 4a43167e..17aa5e8a 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class and b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class b/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class index 7820347e..1dde7ece 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class index 1e73c9c5..b496c1ce 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class index 632f878c..0cd779d8 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class b/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class index 928de6b2..9cf1117a 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class b/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class index d6d6d332..55e37b64 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class and b/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class b/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class index fe512ea9..0e51f50e 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class and b/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class b/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class index 3292b8d2..608326d6 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class and b/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class differ diff --git a/WebRoot/WEB-INF/lib/itext-asian.jar b/WebRoot/WEB-INF/lib/itext-asian.jar deleted file mode 100644 index ec8599ea..00000000 Binary files a/WebRoot/WEB-INF/lib/itext-asian.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/itext-pdfa-5.3.5.jar b/WebRoot/WEB-INF/lib/itext-pdfa-5.3.5.jar deleted file mode 100644 index d2ba830b..00000000 Binary files a/WebRoot/WEB-INF/lib/itext-pdfa-5.3.5.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/itext-xtra-5.3.5.jar b/WebRoot/WEB-INF/lib/itext-xtra-5.3.5.jar deleted file mode 100644 index e3b19725..00000000 Binary files a/WebRoot/WEB-INF/lib/itext-xtra-5.3.5.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/itextpdf-5.3.5.jar b/WebRoot/WEB-INF/lib/itextpdf-5.3.5.jar deleted file mode 100644 index b5a51cd1..00000000 Binary files a/WebRoot/WEB-INF/lib/itextpdf-5.3.5.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/javaee.jar b/WebRoot/WEB-INF/lib/javaee.jar deleted file mode 100644 index ee9b2ad4..00000000 Binary files a/WebRoot/WEB-INF/lib/javaee.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/junit-4.9.jar b/WebRoot/WEB-INF/lib/junit-4.9.jar deleted file mode 100644 index 14208156..00000000 Binary files a/WebRoot/WEB-INF/lib/junit-4.9.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/mail.jar b/WebRoot/WEB-INF/lib/mail.jar deleted file mode 100644 index aa357d4b..00000000 Binary files a/WebRoot/WEB-INF/lib/mail.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar deleted file mode 100644 index db6f529f..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar deleted file mode 100644 index 7cd3a626..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar deleted file mode 100644 index 11fc11b9..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar deleted file mode 100644 index f2e2e927..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar deleted file mode 100644 index bd1367d8..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar deleted file mode 100644 index e46f9eb8..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar deleted file mode 100644 index ea9500d6..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar deleted file mode 100644 index 6ef99d8d..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar deleted file mode 100644 index e149290e..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar deleted file mode 100644 index dcd1e4d9..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar deleted file mode 100644 index f7a3b837..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar deleted file mode 100644 index 9cea2aef..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar deleted file mode 100644 index d0550ccd..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar deleted file mode 100644 index 1688cf74..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar deleted file mode 100644 index 237995c5..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar deleted file mode 100644 index 2f52122b..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar deleted file mode 100644 index 5a2381a0..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar deleted file mode 100644 index 6ec9d681..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar deleted file mode 100644 index 6d13bd40..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar b/WebRoot/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar deleted file mode 100644 index e351ae7b..00000000 Binary files a/WebRoot/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar and /dev/null differ diff --git a/WebRoot/WEB-INF/lib/pinyin4j-2.5.0.jar b/WebRoot/WEB-INF/lib/pinyin4j-2.5.0.jar deleted file mode 100644 index e8ede137..00000000 Binary files a/WebRoot/WEB-INF/lib/pinyin4j-2.5.0.jar and /dev/null differ diff --git a/src/com/jsh/base/BaseDAO.java b/src/com/jsh/base/BaseDAO.java index 3a1434ea..da1fd279 100644 --- a/src/com/jsh/base/BaseDAO.java +++ b/src/com/jsh/base/BaseDAO.java @@ -78,19 +78,19 @@ public class BaseDAO extends HibernateDaoSupport implements BaseIDAO pageUtil.setPageList(query.list()); } - @SuppressWarnings("unchecked") - @Override - public List find(Map conditon)throws DataAccessException - { - return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); - } +// @SuppressWarnings("unchecked") +// @Override +// public List find(Map conditon)throws DataAccessException +// { +// return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); +// } - @SuppressWarnings("unchecked") - @Override - public List find(String hql) throws DataAccessException - { - return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ hql); - } +// @SuppressWarnings("unchecked") +// @Override +// public List find(String hql) throws DataAccessException +// { +// return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ hql); +// } @SuppressWarnings("unchecked") @Override diff --git a/src/com/jsh/base/BaseIDAO.java b/src/com/jsh/base/BaseIDAO.java index 386a7026..148d378a 100644 --- a/src/com/jsh/base/BaseIDAO.java +++ b/src/com/jsh/base/BaseIDAO.java @@ -77,14 +77,14 @@ public interface BaseIDAO * @param conditon 查询条件 * @return 查询列表数据 */ - List find(Map conditon)throws DataAccessException; +// List find(Map conditon)throws DataAccessException; /** * 根据hql查询 --没有分页信息 * @param hql hibernate查询 * @return 查询列表数据 */ - List find(String hql)throws DataAccessException; +// List find(String hql)throws DataAccessException; /** * 根据搜索条件查询--分页