区域公司增加判断名称重复

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

@@ -42,7 +42,7 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
 	
 	@SuppressWarnings("unchecked")
 	private KObject getByName(Session session, String className, String nameValue) {
-		String hql = "from " + className + " where name = :name";
+		String hql = "from " + className + " where name = :name and (discard is null or discard = 0)";
 		Query<KObject> query = session.createQuery(hql);
 		query.setParameter("name", nameValue);
 		List<KObject> list = query.getResultList();

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

@@ -127,4 +127,10 @@ public class DinasOrganizationServiceImpl implements DinasOrganizationService {
 		KObject staff = JSONObjectUtils.toObject(currentStaff, kClass);
 		return staff;
 	}
+
+	@Override
+	public boolean repeatName(String name) {
+		KObject org = dinasOrganizationDao.queryOrganizationByName(name);
+		return org == null ? false : true;
+	}
 }

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

@@ -20,6 +20,8 @@ public interface DinasOrganizationService {
 
 	Object queryStaffByRegionalCompany(UUID fromString);
 	
+	boolean repeatName(String name);
+	
 	/**
 	 * 获取当前区域公司
 	 * @return

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

@@ -45,6 +45,12 @@ public class DinasOrganizationController {
 		 return dinasOrganizationService.queryStaffByRegionalCompany(UUID.fromString(id));
     }
 	
+	@ResponseBody
+    @RequestMapping(value = "/dinasBiz/organization/repeatName/{name}", method = RequestMethod.GET)
+    public boolean repeatName(@PathVariable("name") String name) {
+		 return dinasOrganizationService.repeatName(name);
+    }
+	
 	/**
 	 * 根据区域公司自动生成对应的部门并关联起来
 	 * @param id 区域公司id