Commit 05abc82201aee4bcf15ece246ea072c6a89cb269
1 parent
dd855940
所属单位修改
Showing
1 changed file
with
12 additions
and
13 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java
| ... | ... | @@ -47,8 +47,7 @@ import java.util.stream.IntStream; |
| 47 | 47 | import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; |
| 48 | 48 | import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 49 | 49 | import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; |
| 50 | -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; | |
| 51 | -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; | |
| 50 | +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*; | |
| 52 | 51 | import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.COST_FEE_NOT_EXISTS_001; |
| 53 | 52 | |
| 54 | 53 | /** |
| ... | ... | @@ -227,8 +226,8 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 227 | 226 | .map(importObj -> { |
| 228 | 227 | WaterFeeDO fee = new WaterFeeDO(); |
| 229 | 228 | BeanUtils.copyProperties(importObj, fee); |
| 230 | - fee.setCompanyId(String.valueOf(getLoginUserDeptId())); | |
| 231 | - if (getLoginUserDeptId() == 100) { | |
| 229 | + fee.setCompanyId(String.valueOf(getCompanyId())); | |
| 230 | + if (getCompanyId() == 100) { | |
| 232 | 231 | fee.setCompanyName("蓟城山水"); |
| 233 | 232 | } else { |
| 234 | 233 | // 设置单位id |
| ... | ... | @@ -502,8 +501,8 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 502 | 501 | if (CollectionUtils.isEmpty(dataList)) { |
| 503 | 502 | return; // 空列表无需校验 |
| 504 | 503 | } |
| 505 | - //登录用户部门 | |
| 506 | - Long deptId = getLoginUserDeptId(); | |
| 504 | + //登录用户单位 | |
| 505 | + Long belongCompanyId = getCompanyId(); | |
| 507 | 506 | //单位集合 |
| 508 | 507 | List<DeptRespDTO> companyList = deptApi.getSubDeptList(); |
| 509 | 508 | List<Long> deptIds = companyList.stream().map(DeptRespDTO::getId).collect(Collectors.toList()); |
| ... | ... | @@ -577,7 +576,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 577 | 576 | } |
| 578 | 577 | Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); |
| 579 | 578 | //单位校验 |
| 580 | - validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId); | |
| 579 | + validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId); | |
| 581 | 580 | //部门名称校验 |
| 582 | 581 | validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds()); |
| 583 | 582 | |
| ... | ... | @@ -612,7 +611,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 612 | 611 | } |
| 613 | 612 | Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); |
| 614 | 613 | //单位校验 |
| 615 | - validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId); | |
| 614 | + validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId); | |
| 616 | 615 | //部门名称校验 |
| 617 | 616 | validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds()); |
| 618 | 617 | |
| ... | ... | @@ -646,7 +645,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 646 | 645 | } |
| 647 | 646 | Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); |
| 648 | 647 | //单位校验 |
| 649 | - validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId); | |
| 648 | + validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId); | |
| 650 | 649 | //部门名称校验 |
| 651 | 650 | validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds()); |
| 652 | 651 | |
| ... | ... | @@ -716,7 +715,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 716 | 715 | } |
| 717 | 716 | Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); |
| 718 | 717 | //单位校验 |
| 719 | - validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId); | |
| 718 | + validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId); | |
| 720 | 719 | //部门名称校验 |
| 721 | 720 | validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds()); |
| 722 | 721 | |
| ... | ... | @@ -752,7 +751,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 752 | 751 | |
| 753 | 752 | Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); |
| 754 | 753 | //单位校验 |
| 755 | - validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId); | |
| 754 | + validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId); | |
| 756 | 755 | } catch (ConstraintViolationException ex) { |
| 757 | 756 | // 5. 包装异常，明确行号 + 真实校验错误（ |
| 758 | 757 | throw exception0(BAD_REQUEST.getCode(), String.format("第%d条数据校验失败：%s", rowNum, ex.getMessage()), ex); |
| ... | ... | @@ -761,7 +760,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 761 | 760 | } |
| 762 | 761 | } |
| 763 | 762 | |
| 764 | - private void validatecompany(int rowNum, String companyName, Long companyId, Long deptId){ | |
| 763 | + private void validatecompany(int rowNum, String companyName, Long companyId, Long belongCompanyId){ | |
| 765 | 764 | // 校验数组长度是否一致 |
| 766 | 765 | if (companyId == null) { |
| 767 | 766 | throw exception0(BAD_REQUEST.getCode(), String.format( |
| ... | ... | @@ -770,7 +769,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 770 | 769 | )); |
| 771 | 770 | } |
| 772 | 771 | // 校验导入单位 |
| 773 | - if (deptId != 100 && !deptId.equals(companyId)) { | |
| 772 | + if (belongCompanyId != 100 && !belongCompanyId.equals(companyId)) { | |
| 774 | 773 | throw exception0(BAD_REQUEST.getCode(), String.format( |
| 775 | 774 | "第%d条数据：导入单位%s与当前操作员单位不一致", |
| 776 | 775 | rowNum, companyName | ... | ... |