diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index 9c1bff3..9227075 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; @@ -21,6 +22,7 @@ import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; +import com.casic.missiles.utils.DictCodeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,17 +102,28 @@ QueryWrapper query = new QueryWrapper<>(); query.eq("dept_id", user.getDeptId()); BizLabRelDept dept = labRelDeptMapper.selectOne(query); + + Page resultPage = PageFactory.defaultPage(); if (Objects.nonNull(dept) && "GL".equals(dept.getGroupNo())) { //管理组人员可查待处置 request.setEffectUserId(null); request.setHandleStatus("0"); - return this.baseMapper.selectBatchForHandleList(page, request); } else { //实施人查看处置中(即自己的待处置) request.setEffectUserId(user.getId()); request.setHandleStatus("1"); - return this.baseMapper.selectBatchForHandleList(page, request); } + + resultPage = this.baseMapper.selectBatchForHandleList(page, request); + try { + for (BizResourceCustomerSuggestForm info : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(info); + } + } catch (Exception ignored) { + + } + + return resultPage; } @Override