Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindMenuTreePojo.java

@@ -47,4 +47,6 @@ public class FindMenuTreePojo {
      */
     private Integer systemType;
 
+    private Integer isMain;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -320,6 +320,7 @@ public class KwsMenuService {
 
     private void extracted(Long userId, String clientType, FindMenuTreePojo findMenuTreePojo) {
         findMenuTreePojo.setSystemType(LoginUserHolder.getSystemType());
+        findMenuTreePojo.setIsMain(LoginUserHolder.getIsMain());
         //运营端的管理员不做过滤
         if (Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) && Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
             return;

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -270,7 +270,7 @@
     from kws_menu sm
     left join kws_menu_rights smr on sm.id = smr.menu_id
     where sm.del_flag = 0
-      <if test="systemType != 1 and clientType != 3">
+      <if test="(systemType != 1 and clientType != 3) or (systemType == 1 and isMain == 0)">
         and smr.del_flag = 0
       </if>
     <if test="clientType != null">