ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查流程): 79478

Browse Source
This commit is contained in:
yjz
2024-01-05 14:15:32 +08:00
parent d4d2f923df
commit 85e985bfa3
2 changed files with 243 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+7 -2
View File
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
@@ -151,8 +152,12 @@ public class SysUserController {
.or().like("username", user.getRealnameOrUsername()));
}
queryWrapper.ne("username", "admin");
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
IPage<SysUser> pageList;
try {
pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+8 -1
View File
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.FinishFlagEnum;
@@ -118,7 +120,12 @@ public class WorkCenterController {
public Result<?> getApprovalRecordList(ProcessApprovalRecord processApprovalRecord,
HttpServletRequest req) {
Page<ProcessApprovalRecord> page = new Page<>(1, Integer.MAX_VALUE);
Page<ProcessApprovalRecord> pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
Page<ProcessApprovalRecord> pageList;
try {
pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
return Result.OK(pageList);
}