5-26 - fix

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/KeyProjectAlgorithmCO.java

@@ -55,9 +55,6 @@ public class KeyProjectAlgorithmCO extends ClientObject {
     @ApiModelProperty(value = "相机数量")
     private Integer cameraCount;
 
-    @ApiModelProperty(value = "处置人")
-    private Long disposer;
-
 
 
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/KeyProjectAlgorithmDO.java

@@ -56,9 +56,6 @@ public class KeyProjectAlgorithmDO extends BaseDO {
     @TableField(exist = false)
     private Integer cameraCount;
 
-    @ApiModelProperty(value = "处置人")
-    private Long disposer;
-
     public KeyProjectAlgorithmDO(String keyProjectAlgorithmId) {
         this.keyProjectAlgorithmId = keyProjectAlgorithmId;
     }

web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml

@@ -81,8 +81,10 @@
             group_concat(a.name) as algorithmType
         FROM key_project_camera lpc
             LEFT JOIN camera c ON lpc.camera_id = c.camera_id
-            left join key_project_algorithm_item kpai on kpai.key_project_camera_id = lpc.key_project_camera_id and kpai.delete_enum='false' and
-                kpai.key_project_algorithm_id = #{params.keyProjectAlgorithmId}
+            left join key_project_algorithm_item kpai on kpai.key_project_camera_id = lpc.key_project_camera_id and kpai.delete_enum='false'
+            <if test="params.cameraName != null and params.cameraName != ''">
+                and kpai.key_project_algorithm_id = #{params.keyProjectAlgorithmId}
+            </if>
             left join algorithm a on a.algorithm_id = kpai.algorithm_id
         WHERE lpc.key_project_id = #{params.keyProjectId} and lpc.delete_enum='false'
         <if test="params.cameraName != null and params.cameraName != ''">

web-infrastructure/src/main/resources/mapper/ai/KeyProjectAlgorithmMapper.xml

@@ -12,8 +12,7 @@
             kp.jurisdiction_corpinfo_id,
             kp.apply_status,
             xqdwc.corp_name xqdw_corp_name,
-            count(*) as camera_count,
-            kpau.user_id as disposer
+            count(*) as camera_count
 
         from
             key_project_algorithm kpa