Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
===================================================================
diff -u -r16176 -r16497
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java	(.../FormDefinitionManagerImpl.java)	(revision 16176)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java	(.../FormDefinitionManagerImpl.java)	(revision 16497)
@@ -49,10 +49,15 @@
 	public FormDefinition getFormDefinitionByTypeAndName(String formType,String formName){
 		FormDefinition formDefinition = null;
 		int maxVersion = 0;
+		LoginUserData loginUser = AcegiHelper.getLoginUser();
+		String orgUnitName = loginUser.getCurrentOrgUnitName();
 		if(StringUtils.isNotBlank(formType) && StringUtils.isNotBlank(formName)){
 			String sql = String
-					.format("select max(version) from %s where formName = '%s' and formType = '%s'",
+					.format("select max(version) from %s where formName = '%s' and formType = '%s' ",
 							FormDefinition.class.getSimpleName(), formName,formType);
+			if(StringUtils.isNotBlank(orgUnitName)){
+				sql += " and departNames like '%" + orgUnitName + "%'";
+			}
 			ResultSet rs = objectDao.executeSql(sql);
 			try {
 				while (rs.next()) {