From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index a149ede..52478da 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -59,7 +59,7 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParam insert = new SalaryParam();
- insert.setRootDepartId(salaryParam.getRootDepartId());
+ insert.setRootDepartId(principal.getRootDepartment().getId());
insert.setDepartId(salaryParam.getDepartId());
insert.setProcedureId(salaryParam.getProcedureId());
insert.setMaterialId(salaryParam.getMaterialId());
@@ -155,7 +155,10 @@
@Override
public PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParamDTO model = pageWrap.getModel();
+ model.setRootDepartId(principal.getRootDepartment().getId());
+// model.setDepartId(principal.getComDepartment().getId());
IPage<SalaryParamVO> salaryParamVOIPage = salaryParamMapper.selectPage(page, model);
if (!CollectionUtils.isEmpty(salaryParamVOIPage.getRecords())){
salaryParamVOIPage.getRecords().forEach(s->s.setSalary(s.getSalary().divide(new BigDecimal(100))));
--
Gitblit v1.9.3