Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-server/src/main/java/com/qmth/sop/server/api/SysLevelController.java

@@ -13,6 +13,7 @@ import com.qmth.sop.business.entity.SysLevelRole;
 import com.qmth.sop.business.service.SysLevelRoleService;
 import com.qmth.sop.business.service.SysLevelService;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.ProductTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -102,8 +103,9 @@ public class SysLevelController {
     @ApiOperation(value = "获取档位表列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "档位表列表", response = SysLevel.class)})
-    public Result list(@ApiParam(value = "查询条件", required = false) @RequestParam(required = false) Boolean enable) {
-        return ResultUtil.ok(sysLevelService.list(new QueryWrapper<SysLevel>().lambda().eq(Objects.nonNull(enable),SysLevel::getEnable, enable)));
+    public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable,
+                       @ApiParam(value = "类型", required = false) @RequestParam(required = false) ProductTypeEnum type) {
+        return ResultUtil.ok(sysLevelService.list(new QueryWrapper<SysLevel>().lambda().eq(Objects.nonNull(enable),SysLevel::getEnable, enable).eq(Objects.nonNull(type),SysLevel::getType, type)));
     }
 
     /**