1

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -316,13 +316,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         if(byId.getRoleId() == 47L ){
-            param.getUserIds().add(jyUser.getUserId());
+            param.setUserId(jyUser.getUserId());
         }
         if(byId.getRoleId() !=1 ){
             Integer loginPlatformId = jyUserPlatformService.getLoginPlatformId();
-            if(loginPlatformId != null) {
-                param.getPlatformIds().add(loginPlatformId);
+            if(loginPlatformId == null) {
+               return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
             }
+            param.setPlatformId(loginPlatformId);
             List<String> openNums = jySceneAuthService.getOpenNumList();
             if(!openNums.isEmpty()){
                 param.getAuthNumList().addAll(openNums);
@@ -345,9 +346,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 for (JyUser user : jyUsers) {
                     Long roleId = roleMap.get(user.getId());
                     if(user.getPlatformId() != null && (roleId == 45L || roleId == 48L)){
-                        param.getPlatformIds().add(user.getPlatformId());
+                        param.getOtherPlatformIds().add(user.getPlatformId());
                     }else {
-                        param.getUserIds().add(user.getUserId());
+                        param.getOtherUserIds().add(user.getUserId());
                     }
                 }
             }

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

@@ -23,6 +23,8 @@ public class SceneParam extends RequestBase {
     private String ryNo;
     private Integer authType;
 
-    private List<Long> userIds =  new ArrayList<>();
-    private List<Integer> platformIds = new ArrayList<>();
+    private Integer platformId;
+
+    private List<Long> otherUserIds =  new ArrayList<>();
+    private List<Integer>  otherPlatformIds = new ArrayList<>();
 }

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

@@ -36,25 +36,36 @@
         left join t_user u on s.user_id = u.id
         left join t_camera c on s.camera_id = c.id
         left join jy_user jy on u.id = jy.user_id
-        where  s.rec_status = 'A'
+        where
         <include refid="commonWhere"></include>
 
-        <if test="param.platformIds != null and param.platformIds.size >0">
-            and jy.platform_id in
-            <foreach item="platformId" collection="param.platformIds" open="(" separator="," close=")">
+        <if test="param.userId!=null">
+            and u.id  = #{param.userId}
+        </if>
+        <if test="param.platformId!=null">
+            and jy.platform_id  = #{param.platformId}
+        </if>
+
+        <if test="param.otherPlatformIds != null and param.otherPlatformIds.size >0">
+            or (   <include refid="commonWhere"></include>
+            and  jy.platform_id in
+            <foreach item="platformId" collection="param.otherPlatformIds" open="(" separator="," close=")">
                 #{platformId}
             </foreach>
+            )
         </if>
 
-        <if test="param.userIds !=null and param.userIds.size>0">
-            and  u.id in
-            <foreach item="userId" collection="param.userIds" open="(" separator="," close=")">
+        <if test="param.otherUserIds !=null and param.otherUserIds.size>0">
+            or (<include refid="commonWhere"></include>
+            and u.id in
+            <foreach item="userId" collection="param.otherUserIds" open="(" separator="," close=")">
                 #{userId}
             </foreach>
+            )
         </if>
 
         <if test="param.authNumList !=null and param.authNumList.size>0  ">
-            or (  s.rec_status = 'A'
+            or (
             <include refid="commonWhere"></include>
             and s.num in
             <foreach item="num" collection="param.authNumList" open="(" separator="," close=")">
@@ -68,7 +79,7 @@
     </select>
 
     <sql id="commonWhere">
-
+        s.rec_status = 'A'
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.title like concat ('%',#{param.sceneName},'%')
         </if>