1

src/main/java/com/fdkankan/manage/controller/CompanyController.java

@@ -36,11 +36,13 @@ public class CompanyController {
         companyService.saveOrUpdate(param);
         return ResultData.ok();
     }
+
     @PostMapping("/update")
     public ResultData update(@RequestBody Company param){
         companyService.saveOrUpdate(param);
         return ResultData.ok();
     }
+
     @PostMapping("/delete")
     public ResultData delete(@RequestBody Company param){
         if(param.getId() == null){

src/main/java/com/fdkankan/manage/vo/request/CameraParam.java

@@ -8,6 +8,7 @@ public class CameraParam extends RequestBase {
     private Long id;                            //设备id
     private Long userId;                        //用户id
     private String snCode;                      //相机snCode
+    private Long companyId;
     private String companyName;                 //客户名称
     private String userName;                    //账号
     private Integer outType;                    //出库类型 0表示正常销售，1表示员工自用，2表示礼品赠送，3表示其他

src/main/resources/mapper/manage/CameraMapper.xml

@@ -24,6 +24,9 @@
         <if test="param.companyName !=null and param.companyName != '' ">
             and co.company_name like concat('%',#{param.companyName},'%')
         </if>
+        <if test="param.companyId !=null and param.companyId != '' ">
+            and co.id =#{param.companyId}
+        </if>
         <if test="param.userName !=null and param.userName != '' ">
             and u.user_name like  concat('%',#{param.userName},'%')
         </if>