所属单位修改

wangqian
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;
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.COST_FEE_NOT_EXISTS_001;
 /**
@@ -227,8 +226,8 @@ public class CostFeeServiceImpl implements CostFeeService {
                     .map(importObj -> {
                         WaterFeeDO fee = new WaterFeeDO();
                         BeanUtils.copyProperties(importObj, fee);
-                        fee.setCompanyId(String.valueOf(getLoginUserDeptId()));
-                        if (getLoginUserDeptId() == 100) {
+                        fee.setCompanyId(String.valueOf(getCompanyId()));
+                        if (getCompanyId() == 100) {
                             fee.setCompanyName("蓟城山水");
                         } else {
                             // 设置单位id
@@ -502,8 +501,8 @@ public class CostFeeServiceImpl implements CostFeeService {
         if (CollectionUtils.isEmpty(dataList)) {
             return; // 空列表无需校验
         }
-        //登录用户部门
-        Long deptId = getLoginUserDeptId();
+        //登录用户单位
+        Long belongCompanyId = getCompanyId();
         //单位集合
         List<DeptRespDTO>  companyList = deptApi.getSubDeptList();
         List<Long> deptIds = companyList.stream().map(DeptRespDTO::getId).collect(Collectors.toList());
@@ -577,7 +576,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     }
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
-                    validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId);
+                    validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId);
                     //部门名称校验
                     validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds());
@@ -612,7 +611,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     }
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
-                    validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId);
+                    validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId);
                     //部门名称校验
                     validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds());
@@ -646,7 +645,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     }
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
-                    validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId);
+                    validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId);
                     //部门名称校验
                     validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds());
@@ -716,7 +715,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     }
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
-                    validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId);
+                    validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId);
                     //部门名称校验
                     validateTeams(rowNum, deptList.get(companyId), importBean.getTeamIds());
@@ -752,7 +751,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
-                    validatecompany(rowNum, importBean.getCompanyName(), companyId, deptId);
+                    validatecompany(rowNum, importBean.getCompanyName(), companyId, belongCompanyId);
                 } catch (ConstraintViolationException ex) {
                     // 5. 包装异常，明确行号 + 真实校验错误（
                     throw exception0(BAD_REQUEST.getCode(), String.format("第%d条数据校验失败：%s", rowNum, ex.getMessage()), ex);
@@ -761,7 +760,7 @@ public class CostFeeServiceImpl implements CostFeeService {
         }
     }
-    private void validatecompany(int rowNum, String companyName, Long companyId, Long deptId){
+    private void validatecompany(int rowNum, String companyName, Long companyId, Long belongCompanyId){
         // 校验数组长度是否一致
         if (companyId == null) {
             throw exception0(BAD_REQUEST.getCode(), String.format(
@@ -770,7 +769,7 @@ public class CostFeeServiceImpl implements CostFeeService {
             ));
         }
         // 校验导入单位
-        if (deptId != 100 && !deptId.equals(companyId)) {
+        if (belongCompanyId != 100 && !belongCompanyId.equals(companyId)) {
             throw exception0(BAD_REQUEST.getCode(), String.format(
                     "第%d条数据：导入单位%s与当前操作员单位不一致",
                     rowNum, companyName