Index: forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java =================================================================== diff -u -r22040 -r22083 --- forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java (.../WorkFlowApprovalTask.java) (revision 22040) +++ forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java (.../WorkFlowApprovalTask.java) (revision 22083) @@ -1,6 +1,7 @@ package com.forgon.workflow.model; import java.util.Date; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -31,6 +32,11 @@ private String formType; /** + * 编号 + */ + private String serialNumber; + + /** * 节点：获取方便 任务名称的赋值 不能延迟 * */ private NodeDefinition nodeDefinition; @@ -223,4 +229,13 @@ public void setUserId(Long userId) { this.userId = userId; } + + public String getSerialNumber() { + return serialNumber==null?"":serialNumber; + } + + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + } Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java =================================================================== diff -u -r22060 -r22083 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22060) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22083) @@ -70,8 +70,9 @@ nextWorkFlowApprovalTask.setTaskName(nextNodeDefinition.getName()); nextWorkFlowApprovalTask.setNodeDefinition(nextNodeDefinition); nextWorkFlowApprovalTask.setFormId(workFlowApprovalTaskVO.getFormId()); + nextWorkFlowApprovalTask.setSerialNumber(workFlowApprovalTask.getSerialNumber()); nextWorkFlowApprovalTask.setFormType(workFlowApprovalTaskVO.getFormType()); - nextWorkFlowApprovalTask.setTitle(workFlowApprovalTaskVO.getFormId()+workFlowApprovalTaskVO.getFormType()); + nextWorkFlowApprovalTask.setTitle(String.format("%s-%s", workFlowApprovalTaskVO.getFormType(), workFlowApprovalTask.getSerialNumber())); nextWorkFlowApprovalTask.setCreateTaskTime(new Date()); nextWorkFlowApprovalTask.setStatus(0); @@ -126,7 +127,8 @@ nextWorkFlowApprovalTask.setNodeDefinition(nextNodeDefinition); nextWorkFlowApprovalTask.setFormId(workFlowApprovalTaskVO.getFormId()); nextWorkFlowApprovalTask.setFormType(workFlowApprovalTaskVO.getFormType()); - nextWorkFlowApprovalTask.setTitle(workFlowApprovalTaskVO.getFormId()+workFlowApprovalTaskVO.getFormType()); + nextWorkFlowApprovalTask.setSerialNumber(workFlowApprovalTask.getSerialNumber()); + nextWorkFlowApprovalTask.setTitle(String.format("%s-%s", workFlowApprovalTaskVO.getFormType(), workFlowApprovalTask.getSerialNumber())); nextWorkFlowApprovalTask.setCreateTaskTime(new Date()); nextWorkFlowApprovalTask.setStatus(0); @@ -152,52 +154,7 @@ } } - /** - * 审批回滚 ，保存待办任务 - * - */ - /*public void rollbackWorkFlowApprovalTask(WorkFlowApprovalTaskVO workFlowApprovalTaskVO) { - WorkFlowApprovalTask workFlowApprovalTask=getWorkFlowApprovalTask(workFlowApprovalTaskVO.getWorkFlowApprovalTaskId()); - if(workFlowApprovalTask!=null){ - //获取上一个节点 - NodeDefinition lastNodeDefinition=nodeDefinitionManager.getLastNodeDefinition(workFlowApprovalTaskVO.getNodeDefinitionId()); - workFlowApprovalTask.setHandleOpinion(workFlowApprovalTaskVO.getHandleOpinion()); - workFlowApprovalTask.setHandlerId(workFlowApprovalTaskVO.getHandlerId()); - workFlowApprovalTask.setHandler(workFlowApprovalTaskVO.getHandler()); - workFlowApprovalTask.setHandleTime(new Date()); - workFlowApprovalTask.setStatus(1); - workFlowApprovalTask.setApprovalResult(workFlowApprovalTaskVO.getApprovalResult()); - saveOrUpdateWorkFlowApprovalTask(workFlowApprovalTask); - WorkFlowApprovalTask rollbackWorkFlowApprovalTask=new WorkFlowApprovalTask(); - if(lastNodeDefinition!=null){ - //获取上一个节点的待审批任务 - WorkFlowApprovalTask lastWorkFlowApprovalTask = getWorkFlowApprovalTaskByRollBack(workFlowApprovalTaskVO.getNodeDefinitionId().toString(),workFlowApprovalTask.getFormId()); - rollbackWorkFlowApprovalTask.setTaskName(lastNodeDefinition.getName()); - rollbackWorkFlowApprovalTask.setNodeDefinition(lastNodeDefinition); - rollbackWorkFlowApprovalTask.setFormId(lastWorkFlowApprovalTask.getFormId()); - rollbackWorkFlowApprovalTask.setFormType(lastWorkFlowApprovalTask.getFormType()); - rollbackWorkFlowApprovalTask.setTitle(lastWorkFlowApprovalTask.getFormId()+lastWorkFlowApprovalTask.getFormType()); - rollbackWorkFlowApprovalTask.setCreateTaskTime(new Date()); - rollbackWorkFlowApprovalTask.setUserId(lastWorkFlowApprovalTask.getUserId()); - }else{//节点为空，返回申请人---前台调用家的修改单流程状态 - //根据工号获取工单申请人id - User user= getUserByFormId(workFlowApprovalTask.getFormId()); - rollbackWorkFlowApprovalTask.setTaskName("申请人修改工单"); - rollbackWorkFlowApprovalTask.setFormId(workFlowApprovalTask.getFormId()); - rollbackWorkFlowApprovalTask.setFormType(workFlowApprovalTask.getFormType()); - rollbackWorkFlowApprovalTask.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getFormType()); - rollbackWorkFlowApprovalTask.setCreateTaskTime(new Date()); - if(user!=null) - rollbackWorkFlowApprovalTask.setUserId(user.getId()); - } - rollbackWorkFlowApprovalTask.setApprovalResult(-1); - rollbackWorkFlowApprovalTask.setStatus(0); - saveOrUpdateWorkFlowApprovalTask(rollbackWorkFlowApprovalTask); - } - } -*/ - /** * 根据工单id获取申请人 * */ @@ -209,7 +166,7 @@ } /** - * 审批通过 ，保存待办任务 + * 审批通过 ，获取上一条待办任务 * */ private WorkFlowApprovalTask getWorkFlowApprovalTaskByRollBack(String nodeDefinitionId,Long formId){ @@ -238,6 +195,7 @@ workFlowApprovalTask.setFormId(rs.getLong("formId")); workFlowApprovalTask.setFormType(rs.getString("formType")); workFlowApprovalTask.setHandlerId(rs.getLong("formId")); + workFlowApprovalTask.setSerialNumber(rs.getString("serialNumber")); workFlowApprovalTask.setApprovalResult(rs.getInt("approvalResult")); } } catch (SQLException e) { @@ -377,39 +335,39 @@ workFlowApprovalTask.setStatus(1); workFlowApprovalTask.setApprovalResult(workFlowApprovalTaskVO.getApprovalResult()); saveOrUpdateWorkFlowApprovalTask(workFlowApprovalTask); - WorkFlowApprovalTask workFlowApprovalTask1=new WorkFlowApprovalTask(); + WorkFlowApprovalTask newWorkFlowApprovalTask=new WorkFlowApprovalTask(); if(lastNodeDefinition!=null){ //获取上一个节点的待审批任务 - WorkFlowApprovalTask workFlowApprovalTask2 = getWorkFlowApprovalTaskByRollBack(workFlowApprovalTaskVO.getNodeDefinitionId().toString(),workFlowApprovalTask.getFormId()); - workFlowApprovalTask1.setTaskName(lastNodeDefinition.getName()); - workFlowApprovalTask1.setNodeDefinition(lastNodeDefinition); - workFlowApprovalTask1.setFormId(workFlowApprovalTask2.getFormId()); - workFlowApprovalTask1.setFormType(workFlowApprovalTask2.getFormType()); - workFlowApprovalTask1.setTitle(workFlowApprovalTask2.getFormId()+workFlowApprovalTask2.getFormType()); - workFlowApprovalTask1.setCreateTaskTime(new Date()); + WorkFlowApprovalTask lastWorkFlowApprovalTask = getWorkFlowApprovalTaskByRollBack(workFlowApprovalTaskVO.getNodeDefinitionId().toString(),workFlowApprovalTask.getFormId()); + newWorkFlowApprovalTask.setTaskName(lastNodeDefinition.getName()); + newWorkFlowApprovalTask.setNodeDefinition(lastNodeDefinition); + newWorkFlowApprovalTask.setFormId(lastWorkFlowApprovalTask.getFormId()); + newWorkFlowApprovalTask.setFormType(lastWorkFlowApprovalTask.getFormType()); + newWorkFlowApprovalTask.setTitle(lastWorkFlowApprovalTask.getFormId()+lastWorkFlowApprovalTask.getFormType()); + newWorkFlowApprovalTask.setSerialNumber(lastWorkFlowApprovalTask.getSerialNumber()); + newWorkFlowApprovalTask.setTitle(String.format("%s-%s", workFlowApprovalTaskVO.getFormType(), lastWorkFlowApprovalTask.getSerialNumber())); + newWorkFlowApprovalTask.setCreateTaskTime(new Date()); if(lastNodeDefinition.getAllowNoticeFormMan()){ - User user= getUserByFormId(workFlowApprovalTask2.getFormId()); - workFlowApprovalTask1.setUserId(user.getId()); - workFlowApprovalTask1.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE); + User user= getUserByFormId(lastWorkFlowApprovalTask.getFormId()); + newWorkFlowApprovalTask.setUserId(user.getId()); + newWorkFlowApprovalTask.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE); }else{ - workFlowApprovalTask1.setUserId(workFlowApprovalTask2.getUserId()); - workFlowApprovalTask1.setRoleId(workFlowApprovalTask2.getRoleId()); + newWorkFlowApprovalTask.setUserId(lastWorkFlowApprovalTask.getUserId()); + newWorkFlowApprovalTask.setRoleId(lastWorkFlowApprovalTask.getRoleId()); } - workFlowApprovalTask1.setStatus(0); - saveOrUpdateWorkFlowApprovalTask(workFlowApprovalTask1); }else{//节点为空，返回申请人---前台调用家的修改单流程状态 //根据工号获取工单申请人id User user= getUserByFormId(workFlowApprovalTask.getFormId()); - workFlowApprovalTask1.setTaskName("申请人修改工单"); - workFlowApprovalTask1.setFormId(workFlowApprovalTask.getFormId()); - workFlowApprovalTask1.setFormType(workFlowApprovalTask.getFormType()); - workFlowApprovalTask1.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getFormType()); - workFlowApprovalTask1.setCreateTaskTime(new Date()); + newWorkFlowApprovalTask.setTaskName("申请人修改工单"); + newWorkFlowApprovalTask.setFormId(workFlowApprovalTask.getFormId()); + newWorkFlowApprovalTask.setFormType(workFlowApprovalTask.getFormType()); + newWorkFlowApprovalTask.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getFormType()); + newWorkFlowApprovalTask.setCreateTaskTime(new Date()); if(user!=null) - workFlowApprovalTask1.setUserId(user.getId()); - workFlowApprovalTask1.setStatus(0); - saveOrUpdateWorkFlowApprovalTask(workFlowApprovalTask1); + newWorkFlowApprovalTask.setUserId(user.getId()); } + newWorkFlowApprovalTask.setStatus(0); + saveOrUpdateWorkFlowApprovalTask(newWorkFlowApprovalTask); } } Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js =================================================================== diff -u -r22066 -r22083 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22066) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22083) @@ -65,23 +65,23 @@ //绑定该有的值到passFormObj中 function saveHandleOpinion(){ - var handleOpinion = Ext4.getCmp('passFormObj').getForm().findField('handleOpinion').getValue(); + var handleOpinion = Ext4.getCmp('passFormObj').getForm().findField('passHandleOpinion').getValue(); var userID = Ext4.getCmp('passFormObj').getForm().findField('userID').getValue(); var result = passSaveHandleOpinionFlag(nodeDefinition_id,taskName,workFlowApprovalTaskId,1,handleOpinion,userID,formId,formType); if(result.success){ showResult(result.message); + grid.reloadData(); passWindowObj.close(); approvalWindowObj.close(); - grid.reloadData(); }else{ showResult(result.message); } } function updateHandleOpinion(){ var approvalResult = 0; - var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('handleOpinion').getValue(); + var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue(); var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion); if(result.success){ showResult("审批成功"); @@ -95,7 +95,7 @@ function rollBackHandleOpinion(){ var approvalResult = 0; - var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('handleOpinion').getValue(); + var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue(); var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion); if(result.success){ showResult("审批成功"); @@ -188,7 +188,7 @@ }, renderTo: document.body, items: [ - { + /*{ xtype: 'hiddenfield', name: 'id', value: workFlowApprovalTaskId @@ -208,12 +208,12 @@ xtype: 'hiddenfield', name: 'formId', value: formId - }, + }, */ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "taskName", + name : "failTaskName", value :taskName, allowBlank : false, readOnly : true, @@ -224,7 +224,7 @@ xtype : 'textareafield', border: 0, fieldLabel : '处理意见', - name : "handleOpinion", + name : "failHandleOpinion", flex: 1 }] }); @@ -272,7 +272,7 @@ }, renderTo: document.body, items: [ - { + /* { xtype: 'hiddenfield', name: 'id', value: workFlowApprovalTaskId @@ -293,12 +293,12 @@ name: 'formId', value: formId } - , + , */ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "taskName", + name : "passTaskName", value : taskName, readOnly : true, flex: 1 @@ -307,7 +307,7 @@ xtype : 'textareafield', border: 0, fieldLabel : '处理意见', - name : "handleOpinion", + name : "passHandleOpinion", flex: 1 },{ xtype : 'combo', @@ -368,7 +368,7 @@ }, renderTo: document.body, items: [ - { + /* { xtype: 'hiddenfield', name: 'id', value: workFlowApprovalTaskId @@ -388,12 +388,12 @@ xtype: 'hiddenfield', name: 'formId', value: formId - }, + }, */ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "taskName", + name : "rollBackTaskName", value : taskName, readOnly : true, flex: 1 @@ -402,7 +402,7 @@ xtype : 'textareafield', border: 0, fieldLabel : '处理意见', - name : "handleOpinion", + name : "rollBackHandleOpinion", flex: 1 }] }); @@ -506,7 +506,7 @@ layout : 'fit', title : '审批信息', width : 1000, - height : 500, + height : 515, resizable : false, modal : true, border : false, Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java =================================================================== diff -u -r22046 -r22083 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java (.../WorkFlowManager.java) (revision 22046) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java (.../WorkFlowManager.java) (revision 22083) @@ -22,9 +22,12 @@ /** * 搜索用户 * @param spell 用户fullName 关键词搜索 + * @param limitId 每次取limitId条 + * @param startId 取得起始位置 + * @param pageId * @return */ - public List searchUserBySpellOrId(String spell); + public List searchUserBySpellOrId(String spell, Integer pageId, Integer startId, Integer limitId); /** * 保存工作流以及该流下的节点定义、节点审批 @@ -79,6 +82,13 @@ */ public Boolean isWorkFlowRunning(Long WorkFlowId); + /** + * 搜索用户数量 + * @param spell 用户fullName 关键词搜索 + * @return + */ + public int searchUserCountBySpellOrId(String spell); + } Index: ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js =================================================================== diff -u -r22046 -r22083 --- ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js (.../approvalRecord.js) (revision 22046) +++ ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js (.../approvalRecord.js) (revision 22083) @@ -127,8 +127,8 @@ }, { header : "处理结果", dataIndex : 'approvalResult', - width : 70, - minWidth : 70, + width : 100, + minWidth : 100, filterable : true, filter : { type : 'string' @@ -192,11 +192,12 @@ recordFormObj = Ext4.create('Ext4.form.Panel', { - layout : 'vbox', + //layout : 'vbox', + layout : 'fit', frame : true, border : 0, labelSeparator : ': ', - bodyPadding : '5 5 0', + //bodyPadding : '5 5 0', autoScroll : true, buttonAlign : 'center', buttons : [], @@ -214,7 +215,7 @@ layout : 'fit', title : '审批记录信息', width : 1000, - height : 380, + height : 400, resizable : false, modal : true, border : false, Index: forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java =================================================================== diff -u -r22060 -r22083 --- forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java (.../WorkFlowAction.java) (revision 22060) +++ forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java (.../WorkFlowAction.java) (revision 22083) @@ -131,8 +131,25 @@ * */ public void getUserJson() { String spell = StrutsParamUtils.getPraramValue("spell", ""); + String page = StrutsParamUtils.getPraramValue("page", ""); + Integer pageId=null; + if(StringUtils.isNotBlank(page)){ + pageId=Integer.valueOf(page); + } + String start = StrutsParamUtils.getPraramValue("start", ""); + Integer startId=null; + if(StringUtils.isNotBlank(start)){ + startId=Integer.valueOf(start); + } + String limit = StrutsParamUtils.getPraramValue("limit", ""); + Integer limitId=null; + if(StringUtils.isNotBlank(limit)){ + limitId=Integer.valueOf(limit); + } List> list = new LinkedList<>(); - List userList = workFlowManager.searchUserBySpellOrId(spell); + int totalCount = workFlowManager.searchUserCountBySpellOrId(spell); + + List userList = workFlowManager.searchUserBySpellOrId(spell,pageId,startId,limitId); Map reMap; Long id; String name; @@ -144,9 +161,12 @@ reMap.put("name", name); list.add(reMap); } - PageEntity pageEntity = PageUtil.getPagePara(); - pageEntity.setNeedToEscape(true); - PageUtil.outPutResult(pageEntity, list); + JSONObject jsonObject=new JSONObject(); + jsonObject =PageUtil.buildOutPutProperty(jsonObject, list, totalCount); + //需要做转义处理 + //这里一定要将\\转成\,因为返回页面的jsonObject是以toString的形式返回的,如果这里有属性使用了escapeEcmaScript转码,那么toString会在转码之后再加上一个反斜杠,所以要在这里做处理 + String result = jsonObject.toString().replace("\\\\", "\\"); + StrutsResponseUtils.output(result); } /** * 大保存 流程 节点 节点审批 Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp =================================================================== diff -u -r22040 -r22083 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22040) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22083) @@ -22,6 +22,7 @@ var APPROVALRESULT_NOTICEFAIL = <%=WorkFlowApprovalTask.APPROVALRESULT_NOTICEFAIL%> //申请人针对审批不通过通知申请单人 <%-- 引入本身的js --%> + Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java =================================================================== diff -u -r22066 -r22083 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 22066) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 22083) @@ -182,6 +182,7 @@ workFlowApprovalTask.setTitle(String.format("%s-%s", invoicePlan.getType(), invoicePlan.getSerialNumber())); workFlowApprovalTask.setCreateTaskTime(new Date()); workFlowApprovalTask.setStatus(0); + workFlowApprovalTask.setSerialNumber(invoicePlan.getSerialNumber()); //如果此节点有多个节点审批，则以第一条为准 List nodeApprovals = nodeDefinition.getNodeApprovals(objectDao); Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java =================================================================== diff -u -r22046 -r22083 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java (.../WorkFlowManagerImpl.java) (revision 22046) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java (.../WorkFlowManagerImpl.java) (revision 22083) @@ -92,8 +92,24 @@ return false; } + public int searchUserCountBySpellOrId(String spell) { + String spe = spell.toUpperCase(); + String hql = " where 1=1 "; + Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); // 匹配中文字符的正则表达式 + Matcher m = pat.matcher(spe); + String searchMode = AcegiHelper.getLoginUser().getSearchMode(); + if (spe.trim().length() > 0) { + if(StringUtils.isBlank(spell)) + hql += m.find() ? " " : SqlUtils.getSearchSQL(searchMode, spe); + else + hql += m.find() ? " and po.fullName like '%" + spell + "%'" : SqlUtils.getSearchSQL(searchMode, spe); + } + return objectDao.countObjectBySql(User.class.getSimpleName(),hql); + } + + @Override - public List searchUserBySpellOrId(String spell) { + public List searchUserBySpellOrId(String spell, Integer pageId, Integer startId, Integer limitId) { String spe = spell.toUpperCase(); String hql = " where 1=1 "; Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); // 匹配中文字符的正则表达式 @@ -105,7 +121,18 @@ else hql += m.find() ? " and po.fullName like '%" + spell + "%'" : SqlUtils.getSearchSQL(searchMode, spe); } - return objectDao.findBySql(User.class.getSimpleName(), hql); + //初始时，start 为0 和 page为1 和 limit为50 + + if(pageId == null){ + pageId = 1; + } + if(limitId == null){ + limitId = 50; + } + int index = (int) ((pageId - 1) * limitId); + int count =limitId; + return objectDao.findBySql(User.class.getSimpleName(), hql, + index, count, null); } @Override