svnno****@sourc*****
svnno****@sourc*****
2009年 1月 31日 (土) 06:38:44 JST
Revision: 1706
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1706
Author: shinsuke
Date: 2009-01-31 06:38:44 +0900 (Sat, 31 Jan 2009)
Log Message:
-----------
removed disabled users from a list. a duplicate user check.
Modified Paths:
--------------
timecard/trunk/src/main/java/jp/sf/pal/timecard/TimecardConstants.java
timecard/trunk/src/main/java/jp/sf/pal/timecard/service/EmployeeService.java
-------------- next part --------------
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/TimecardConstants.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/TimecardConstants.java 2009-01-30 20:42:46 UTC (rev 1705)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/TimecardConstants.java 2009-01-30 21:38:44 UTC (rev 1706)
@@ -110,4 +110,5 @@
public static final String DOWNLOAD_USER_ID = "downloadUserId";
+ public static final String USER_DISABLED = "D";
}
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/service/EmployeeService.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/service/EmployeeService.java 2009-01-30 20:42:46 UTC (rev 1705)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/service/EmployeeService.java 2009-01-30 21:38:44 UTC (rev 1706)
@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;
+import jp.sf.pal.timecard.TimecardConstants;
import jp.sf.pal.timecard.common.util.PagingResultBeanWrapper;
import jp.sf.pal.timecard.db.allcommon.cbean.PagingResultBean;
import jp.sf.pal.timecard.db.cbean.EmployeeCB;
@@ -17,6 +18,7 @@
import jp.sf.pal.timecard.pager.EmployeePager;
import org.seasar.framework.container.hotdeploy.HotdeployUtil;
+import org.seasar.struts.exception.ActionMessagesException;
public class EmployeeService implements Serializable {
@@ -66,6 +68,10 @@
}
cb.query().setDeletedBy_IsNull();
+ cb.query().queryUserInfoByUsername().setStatus_NotEqual(
+ TimecardConstants.USER_DISABLED);
+ cb.query().queryUserInfoByUsername().setDeletedBy_IsNull();
+
cb.query().addOrderBy_Username_Asc();
cb.query().addOrderBy_UpdatedBy_Asc();
@@ -93,6 +99,18 @@
public void store(Employee employee) {
boolean isUpdate = employee.getId() != null;
+ if (!isUpdate) {
+ // check a existing user
+ EmployeeCB cb = new EmployeeCB();
+ cb.query().setUsername_Equal(employee.getUsername());
+ cb.query().setDeletedBy_IsNull();
+ int count = employeeBhv.selectCount(cb);
+ if (count > 0) {
+ throw new ActionMessagesException(
+ "errors.employee_already_exists");
+ }
+ }
+
Timestamp now = new Timestamp(System.currentTimeMillis());
employee.setUpdatedTime(now);