Merge branch 'pre' into gas

2 years ago · 27d55c471e
parent e0cb9df0e0 17c61babbf
commit 27d55c471e
1 changed files with 1 additions and 1 deletions
--- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
@ -750,10 +750,10 @@ public class HighGasController {
            }

            if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) {
-                param.put("companyId", userInfoModel.getBsCompany().getId());
                param.put("merId", merId);

            } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) {
+                param.put("companyId", userInfoModel.getBsCompany().getId());
                param.put("merId", merId);

            } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type2.getType())) {