投递柜商户数据

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java

@@ -55,6 +55,8 @@ public class RecycleDeviceController {
 
     @Autowired
     private RecycleDeviceService recycleDeviceService;
+    @Autowired
+    private CompanyService companyService;
     @Resource
     private RecycleBucketService recycleBucketService;
     @Resource
@@ -312,6 +314,21 @@ public class RecycleDeviceController {
         List<RecycleDeviceEntity> list = recycleDeviceService.list(lambda);
         return ActionResult.success(list);
     }
+    //获取商户列表
+    @PostMapping("/getCompanyList")
+    @Operation(summary = "获取商户列表下拉")
+    public ActionResult getCompanyList() {
+        UserInfo userInfo = userProvider.get();
+        Boolean isAdministrator = userInfo.getIsAdministrator();
+        String organizeId = userInfo.getOrganizeId();
+        QueryWrapper<CompanyEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CompanyEntity> lambda = wrapper.lambda();
+        if(!isAdministrator){
+            lambda.eq(CompanyEntity::getId,organizeId);
+        }
+        List<CompanyEntity> list = companyService.list(lambda);
+        return ActionResult.success(list);
+    }
 
 
 }

jnpf-java-boot/jnpf-web/src/api/device.js

@@ -212,3 +212,10 @@ export function getDeviceListInfo(query) {
     data: query
   });
 }
+// 获取商户列表
+export function getCompanyList() {
+  return request({
+    url: `/api/scm/RecycleDevice/getCompanyList`,
+    method: "POST"
+  });
+}