修改权限bug

huimv-admin/src/main/java/com/huimv/admin/config/ApiPrefixAutoConfiguration.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+
+    /**
+     *
+     * <p>
+     * 增加restApi前缀
+     * </p>
+     *
+     */
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.addPathPrefix("/huatongApi",  c -> c.isAnnotationPresent(RestController.class));
+    }
+
+}

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/*/my/*");
+                excludePathPatterns("/huatongApi/admin/my/*");
     }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -27,19 +27,19 @@ import java.util.concurrent.TimeUnit;
 @CrossOrigin
 public class LoginController {
 
-
-
     @Autowired
     ILoginService iLoginService;
 
-
+    @RequestMapping("/test")
+    public String logout() {
+        return "线上服务器1";
+    }
 
     @RequestMapping("/logout")
     public Result logout(@RequestParam(name = "accountName", required = true) String accountName, @RequestParam(name = "password", required = true) String password) {
         return iLoginService.logout();
     }
 
-
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 

huimv-admin/src/main/java/com/huimv/admin/controller/SysAccountMultilevelController.java

@@ -54,7 +54,13 @@ public class SysAccountMultilevelController {
         int pageSize = (Integer)map.get("pageSize");
         String searchStr = (String)map.get("searchStr");
         return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,userId);
+    }
 
+    @PostMapping("/listSubordinateByFarm")
+    public Result listSubordinateByFarm(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        String farmId = (String)map.get("farmId");
+        return accountMultilevelService.listSubordinateByFarm(farmId,userId);
     }
 
     @PostMapping("/add")

huimv-admin/src/main/java/com/huimv/admin/service/ISysAccountMultilevelService.java

@@ -27,4 +27,6 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
     Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer userId);
 
     Result getLastFarmId(Integer userId);
+
+    Result listSubordinateByFarm(String farmId, Integer userId);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -45,12 +45,8 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
         if (account > 0 ){
             return new Result(10001,"该账号已经存在，请重新创建",false);
-
         }
-
         SysAccountMultilevel byId = this.getById(userId);
-
-
         sysAccountMultilevel.setPid(userId);
         sysAccountMultilevel.setPids(byId.getPids()+","+userId);
         sysAccountMultilevel.setType(byId.getType());
@@ -119,4 +115,13 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return new Result(ResultCode.SUCCESS,lastFarmId);
     }
 
+    @Override
+    public Result listSubordinateByFarm(String farmId, Integer userId) {
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.like("pids",userId);
+        wrapper.like("farm_ids",farmId);
+        List<SysAccountMultilevel> page = this.list( wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
 }