From bd0b20e0bd549e4b70a552a3a29d6df419c2d43b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 八月 2023 01:42:43 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 3 +++
server/src/main/resources/mappers/SystemPermissionMapper.xml | 1 +
server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java | 18 +++++++++++++-----
server/src/main/resources/application.yml | 2 +-
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 20 ++++++++++++--------
server/src/main/resources/mappers/SalaryParamMapper.xml | 4 +++-
server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java | 12 +++++++++---
7 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
index df50d3f..26b5b64 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
@@ -6,12 +6,10 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.utils.Constants;
import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.system.SystemRoleMapper;
import doumeemes.dao.system.dto.CreateRoleMenuDTO;
import doumeemes.dao.system.dto.CreateRolePermissionDTO;
-import doumeemes.dao.system.model.SystemDataPermission;
-import doumeemes.dao.system.model.SystemRole;
-import doumeemes.dao.system.model.SystemRoleMenu;
-import doumeemes.dao.system.model.SystemRolePermission;
+import doumeemes.dao.system.model.*;
import doumeemes.service.system.SystemDataPermissionService;
import doumeemes.service.system.SystemRoleMenuService;
import doumeemes.service.system.SystemRolePermissionService;
@@ -22,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -35,6 +34,8 @@
private SystemRolePermissionService systemRolePermissionService;
@Autowired
private SystemDataPermissionService systemDataPermissionService;
+ @Autowired
+ private SystemRoleMapper systemRoleMapper;
@Autowired
private SystemRoleMenuService systemRoleMenuService;
@@ -118,13 +119,20 @@
deleteDto.setCompanyId(user.getCompany().getId());
}
systemRolePermissionService.delete(deleteDto);
+ List<SystemRolePermission> list = new ArrayList<>();
// 鏂板鏂扮殑鏉冮檺
for (Integer permissionId : dto.getPermissionIds()) {
SystemRolePermission newRolePermission = new SystemRolePermission();
newRolePermission.setRoleId(dto.getRoleId());
+ newRolePermission.setCreateTime(new Date());
+ newRolePermission.setDeleted(Boolean.FALSE);
+ newRolePermission.setStatus(Constants.ZERO);
newRolePermission.setPermissionId(permissionId);
- systemRolePermissionService.create(newRolePermission);
+ list.add(newRolePermission);
+// systemRolePermissionService.create(newRolePermission);
}
+ if(list.size()>0)
+ systemRoleMapper.insertRolePermissionBatch(list);
}
@Override
@Transactional
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
index c362faa..1dd8edb 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -51,6 +51,9 @@
@ApiModelProperty(value = "浜у搧鍚嶇О" )
@ExcelColumn(name="鐗╂枡鍚嶇О",index =3)
private String materialName;
+ @ApiModelProperty(value = "宸ュ巶鍚嶇О" )
+ @ExcelColumn(name="宸ュ巶鍚嶇О",index =13)
+ private String departName;
@ApiModelProperty(value = "浜у搧缂栫爜" )
@ExcelColumn(name="鐗╂枡缂栫爜",index =4)
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 e5c75b8..368d0ae 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -62,12 +62,13 @@
@Override
public Integer create(SalaryParam salaryParam) {
-
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ DepartmentExtListVO department =departmentExtService.getModelById(principal.getCompany().getId(),salaryParam.getDepartId());
+ Integer comDepartId = departmentExtService.getComDepartId(department);
SalaryParam insert = new SalaryParam();
insert.setRootDepartId(principal.getRootDepartment().getId());
insert.setDepartId(salaryParam.getDepartId());
+// insert.setDepartId(comDepartId);
insert.setProcedureId(salaryParam.getProcedureId());
insert.setMaterialId(salaryParam.getMaterialId());
insert.setDeleted((byte) Constants.ZERO);
@@ -166,7 +167,7 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParamDTO model = pageWrap.getModel();
model.setRootDepartId(principal.getRootDepartment().getId());
-// model.setDepartId(principal.getComDepartment().getId());
+// model.setDepartId(principal.getCurComDepartment().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))));
@@ -220,16 +221,19 @@
dparam.setType(Constants.DEPART_TYPE.factory);
dparam = departmentExtService.findOne(dparam);
if (Objects.isNull(dparam)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愬叕鍙稿悕绉般�戞湁璇紒");
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愬伐鍘傜粍缁囥�戞湁璇紒");
}
DepartmentExtListVO department = new DepartmentExtListVO();
- BeanUtils.copyProperties(dparam, department);
+ department.setId(dparam.getId());
+ department.setType(dparam.getType());
+ department.setParentId(dparam.getParentId());
+ department.setRootId(dparam.getRootId());
+ department.setCompanyId(dparam.getCompanyId());
Integer comDepartId = departmentExtService.getComDepartId(department);
-
QueryWrapper<Material> materialWrapper = new QueryWrapper<>();
materialWrapper.lambda()
.eq(Material::getCode,salaryParamImportDTO.getMaterialCode())
- .eq(Material::getRootDepartId,department.getRootId())
+ .eq(Material::getRootDepartId,dparam.getRootId())
.eq(Material::getDeleted,Constants.ZERO)
.last("limit 1");
Material material = materialMapper.selectOne(materialWrapper);
@@ -263,7 +267,7 @@
}
SalaryParam salaryParam = new SalaryParam();
salaryParam.setRootDepartId(department.getRootId());
- salaryParam.setDepartId(department.getId());
+ salaryParam.setDepartId(dparam.getId());
salaryParam.setProcedureId(procedures.getId());
salaryParam.setMaterialId(materialDistribute.getId());
salaryParam.setSalary(salaryParamImportDTO.getSalary());
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java
index 6ae91f3..ed51da0 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java
@@ -43,15 +43,21 @@
this.updateById(systemRolePermission);
}
- @Override
+ /* @Override
public void delete(SystemRolePermission systemRolePermission) {
SystemRolePermission newPermission = new SystemRolePermission();
newPermission.setDeleted(Boolean.TRUE);
UpdateWrapper<SystemRolePermission> updateWrapper = new UpdateWrapper<>(systemRolePermission);
- /* if(systemRolePermission.getCompanyId()!=null){
+ *//* if(systemRolePermission.getCompanyId()!=null){
updateWrapper.exists("select system_role.id from system_role where system_role.id=system_role_permission.`ROLE_ID` and system_role.`COMPANY_ID`="+systemRolePermission.getCompanyId());
- }*/
+ }*//*
systemRolePermissionMapper.update(newPermission, updateWrapper);
+ }*/
+ @Override
+ public void delete(SystemRolePermission systemRolePermission) {
+ SystemRolePermission newPermission = new SystemRolePermission();
+ newPermission.setRoleId(systemRolePermission.getRoleId());
+ systemRolePermissionMapper.delete(new QueryWrapper<>(newPermission));
}
@Override
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 72fcf23..dd0fac5 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standard
+ active: standardPro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index 9ee4b05..30797f2 100644
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -9,12 +9,14 @@
m.`NAME` as materialName,
m.`CODE` as materialCode,
p.`NAME` as procedureName,
- su.REALNAME as createUserName
+ su.REALNAME as createUserName,
+ d.name as departName
from
salary_param sp
LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
LEFT JOIN material_distribute md on md.ID = sp.MATERIAL_ID
LEFT JOIN material m on m.ID = md.MATERIAL_ID
+ LEFT JOIN department d on sp.DEPART_ID= d.id
LEFT JOIN `system_user` su on su.ID = sp.CREATE_USER
where
sp.DELETED = 0
diff --git a/server/src/main/resources/mappers/SystemPermissionMapper.xml b/server/src/main/resources/mappers/SystemPermissionMapper.xml
index 6618345..0c303aa 100644
--- a/server/src/main/resources/mappers/SystemPermissionMapper.xml
+++ b/server/src/main/resources/mappers/SystemPermissionMapper.xml
@@ -86,6 +86,7 @@
perm.DELETED = 0
AND role_perm.ROLE_ID = #{roleId}
</where>
+ GROUP BY perm.id
</select>
</mapper>
--
Gitblit v1.9.3