修复子账户查看不了销售统计的问题

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -19,7 +19,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 自定义去除的路径
-        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
+        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/**","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
                 "/tProportion/**","/tProduct/**","/tPromoCode/**", "/tApkInfo/**", "/tProduct/selectProductList",  "/tApkInfo/**","/tJoinpayMchCheck/**","/tTimeRule/**","/sysRoleMenu/**",
                 "/tEquipmentApply/**","/tEquipment/**","/api/**","/tOrder/**","/tAlarmClock/**","/tNotice/**","/tParameters/**","/tAdmin/setRole",
                 "/tLabel/**","/tArea/**","/error"};

src/main/java/com/szwl/controller/TAdminController.java

@@ -108,6 +108,9 @@ public class TAdminController {
         entity.setLoginFailureCount(0);
         entity.setEmail(param.getEmail());
         entity.setPhone(param.getPhone());
+        //获取父账号信息
+        TAdmin parentAdmin = tAdminService.getById(parentId);
+        entity.setIfForeign(parentAdmin.getIfForeign());
         tAdminService.save(entity);
         // 管理的机器 需要再建立一个关系表 type区分全部还是部分
         String equipmentIds = param.getEquipmentIds();

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -220,7 +220,13 @@ public class TEquipmentController {
     }
     @ApiOperation(value = "id查找机器详情")
     @PostMapping("/findById2")
-    public ResponseModel<?> findById2(@RequestParam Long id) {
+    public ResponseModel<TEquipment> findById2(@RequestParam Long id) {
+        TEquipment equipment = tEquipmentService.getById(id);
+        return R.ok(equipment);
+    }
+    @ApiOperation(value = "id查找机器详情")
+    @GetMapping("/findEquipmentById")
+    public ResponseModel<TEquipment> findEquipmentById(@RequestParam String id) {
         TEquipment equipment = tEquipmentService.getById(id);
         return R.ok(equipment);
     }

src/main/resources/bootstrap.yml

@@ -56,9 +56,9 @@ eureka:
     serviceUrl:
       defaultZone: http://120.25.151.99:49001/eureka/
     register-with-eureka: true
-  instance:
-    prefer-ip-address: true
-    ip-address: 120.25.151.99
+#  instance:
+#    prefer-ip-address: true
+#    ip-address: 120.25.151.99
 
 ---
 ##正式环境
@@ -75,7 +75,7 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://112.74.63.148:49001/eureka/,http://47.112.127.131:49001/eureka/
+      defaultZone: http://10.0.0.152:49001/eureka/,http://10.0.0.153:49001/eureka/
     register-with-eureka: true
   instance:
     prefer-ip-address: true