Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r21526 -r21769 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 21526) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 21769) @@ -33,6 +33,7 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; +import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.tousseGroup.service.TousseGroupManager; import com.forgon.disinfectsystem.common.CssdUtils; @@ -202,9 +203,11 @@ Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); StringBuilder sqlBuilder = new StringBuilder(" where 1=1 "); - //1、当前登录用户的过滤(即:1、处理科室用户能看到已经提交的单 2、申请科室用户只能看到本科室申请的单) - String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); - String loginUserSql = String.format(" and ((po.handleDepartCoding = '%s' and po.committedStatus = 1) or po.departCoding = '%s') ", currentOrgUnitCode, currentOrgUnitCode); + //1、当前登录用户的过滤(即:1、处理科室用户能看到已经提交的单 2、申请科室用户只能看到本科室申请的单 3、自己填的单) + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + String currentOrgUnitCode = loginUserData.getCurrentOrgUnitCode(); + String userFullName = loginUserData.getUserFullName(); + String loginUserSql = String.format(" and ((po.handleDepartCoding = '%s' and po.committedStatus = 1) or po.departCoding = '%s' or po.applicant='%s') ", currentOrgUnitCode, currentOrgUnitCode, userFullName); sqlBuilder.append(loginUserSql); //2、不包含的申请单类型