修复bug

src/main/java/com/mmc/pms/controller/lease/AppGoodsController.java

@@ -41,6 +41,6 @@ public class AppGoodsController extends BaseController {
     @PostMapping("leaseGoodsList")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)})
     public ResultBody leaseGoodsList(@RequestBody LeaseGoodsQO param) {
-        return leaseGoodsService.leaseGoodsList(param, null);
+        return leaseGoodsService.leaseGoodsList(param);
     }
 }

src/main/java/com/mmc/pms/service/lease/LeaseGoodsService.java

@@ -23,6 +23,8 @@ public interface LeaseGoodsService {
 
     ResultBody leaseGoodsList(LeaseGoodsQO param, LoginSuccessDTO loginSuccessDTO);
 
+    ResultBody leaseGoodsList(LeaseGoodsQO param);
+
     ResultBody batchOnShelfOrTakeDown(List<Integer> goodsIds, Integer status);
 
     ResultBody batchRemoveWareInfo(List<Integer> list);

src/main/java/com/mmc/pms/service/lease/impl/LeaseGoodsServiceImpl.java

@@ -121,18 +121,21 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
 
     @Override
     public ResultBody leaseGoodsList(LeaseGoodsQO param, LoginSuccessDTO loginSuccessDTO) {
-        if (loginSuccessDTO != null && loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+        if (loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
             // 超级管理员获取所有商品信息
             return ResultBody.success(getLeaseGoodsInfo(param, 1));
-        } else if (loginSuccessDTO != null && !loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+        } else {
             // 非超级管理员获取自家的商品信息
             param.setUserAccountId(loginSuccessDTO.getUserAccountId());
             return ResultBody.success(getLeaseGoodsInfo(param, 1));
-        } else {
-            return ResultBody.success(getLeaseGoodsInfo(param, 0));
         }
     }
 
+    @Override
+    public ResultBody leaseGoodsList(LeaseGoodsQO param) {
+        return ResultBody.success(getLeaseGoodsInfo(param, 0));
+    }
+
     private PageResult getLeaseGoodsInfo(LeaseGoodsQO param, Integer type) {
         int count;
         if (type.equals(1)) {