4.21bug优化

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SystemMailboxServiceImpl.java

@@ -52,6 +52,7 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy
         EntityWrapper<SystemMailbox> entityWrapper = new EntityWrapper();
         EntityWrapper<SystemMailbox> entityWrapper = new EntityWrapper();
         RequestContext context = ContextHolder.get();
         RequestContext context = ContextHolder.get();
         entityWrapper.eq("site_id",context.getSiteId());
         entityWrapper.eq("site_id",context.getSiteId());
+        entityWrapper.eq("deleted",0);
         if(ObjectUtil.isNotEmpty(conditionVo.getContactName())){
         if(ObjectUtil.isNotEmpty(conditionVo.getContactName())){
             entityWrapper.like("contact_name",conditionVo.getContactName());
             entityWrapper.like("contact_name",conditionVo.getContactName());
         }
         }

cloud-site-service/src/main/resources/mapper/MyItemConfigMapper.xml

@@ -71,6 +71,9 @@
                 select item_id from my_item_config_role where role_id in(
                 select item_id from my_item_config_role where role_id in(
                 select role_id  from cloud_system.authz_account_role aar where account_id =#{accountId}))
                 select role_id  from cloud_system.authz_account_role aar where account_id =#{accountId}))
             </if>
             </if>
+            <if test="accountId ==null">
+                and my.id not in(1237069526114295813)
+            </if>
             <if test="terminalType !=null">
             <if test="terminalType !=null">
                 and my.terminal_type in
                 and my.terminal_type in
                 <foreach collection="terminalType" item="t" open="(" close=")" separator=",">
                 <foreach collection="terminalType" item="t" open="(" close=")" separator=",">

cloud-site-service/src/main/resources/mapper/PortalTerminalMapper.xml

@@ -27,7 +27,7 @@
     
     
     <select id="listPortal" resultType="com.yizhi.site.application.vo.site.TerminalListVO">
     <select id="listPortal" resultType="com.yizhi.site.application.vo.site.TerminalListVO">
     	select id, terminal_name AS terminalName, state, update_by_name AS updateByName, update_time AS updateTime,type from tr_portal_terminal
     	select id, terminal_name AS terminalName, state, update_by_name AS updateByName, update_time AS updateTime,type from tr_portal_terminal
-    	where site_id=#{siteId} and company_id=#{companyId} and display=1 group by type
+    	where site_id=#{siteId} and company_id=#{companyId} and display=1
     </select>
     </select>