Index: forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java =================================================================== diff -u -r17774 -r21531 --- forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java (.../DirectoryHelper.java) (revision 17774) +++ forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java (.../DirectoryHelper.java) (revision 21531) @@ -23,7 +23,6 @@ import com.forgon.security.model.User; import com.forgon.security.service.RoleManager; import com.forgon.security.service.UserManager; -import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.Constants; import com.forgon.tools.GB2Alpha; Index: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java =================================================================== diff -u -r18388 -r21531 --- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java (.../DateQueryAdapter.java) (revision 18388) +++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java (.../DateQueryAdapter.java) (revision 21531) @@ -1,10 +1,11 @@ package com.forgon.databaseadapter.service; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.time.DateUtils; + import com.forgon.Constants; import com.forgon.tools.db.InitDbConnection; Index: forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java =================================================================== diff -u -r20481 -r21531 --- forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java (.../OrgUnitAction.java) (revision 20481) +++ forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java (.../OrgUnitAction.java) (revision 21531) @@ -1,7 +1,6 @@ package com.forgon.directory.action; import java.io.IOException; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -20,22 +19,15 @@ import org.apache.commons.lang.StringUtils; import com.forgon.Constants; -import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.CssdServiceDepts; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; -import com.forgon.log.model.Log; -import com.forgon.log.service.LogManager; -import com.forgon.serialnumber.model.SerialNum; -import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.PageUtil; -import com.forgon.tools.util.StrutsUtils; import com.forgon.treenode.ext.model.ExtTreeNode; import com.forgon.treenode.model.THTreeNode; import com.forgon.treenode.service.THTreeNodeManager; Index: forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java =================================================================== diff -u -r16279 -r21531 --- forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java (.../DirectoryManager.java) (revision 16279) +++ forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java (.../DirectoryManager.java) (revision 21531) @@ -1,13 +1,12 @@ package com.forgon.directory.service; +import java.util.List; +import java.util.Map; + import com.forgon.directory.vo.DirectoryVo; import com.forgon.entity.PageEntity; import com.forgon.security.model.User; -import net.sf.json.JSONArray; -import java.util.List; -import java.util.Map; - /** * Created by zhonghaowen on 2016/12/7. */ Index: forgon-core/src/main/java/com/forgon/directory/service/PersonalSettingManagerImpl.java =================================================================== diff -u -r12331 -r21531 --- forgon-core/src/main/java/com/forgon/directory/service/PersonalSettingManagerImpl.java (.../PersonalSettingManagerImpl.java) (revision 12331) +++ forgon-core/src/main/java/com/forgon/directory/service/PersonalSettingManagerImpl.java (.../PersonalSettingManagerImpl.java) (revision 21531) @@ -2,7 +2,6 @@ import java.util.List; - import com.forgon.directory.mailremotemanager.service.RemoteManagerClient; import com.forgon.security.model.User; import com.forgon.security.service.UserManager;