Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookAqbwbndjh.java

@@ -39,6 +39,8 @@ public class CoreSafetyBookAqbwbndjh extends BaseEntity {
     @TableField(exist = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<Date> range;
+    @TableField(exist = false)
+    private String selectOrgPath;
     /**
      * 工作主题
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdj.java

@@ -37,6 +37,8 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
     private Long id;
     @TableField(exist = false)
     private List<Date> range;
+    @TableField(exist = false)
+    private String selectOrgPath;
     /**
      * 工作主题
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookAqbwbndjhServiceImpl.java

@@ -14,6 +14,7 @@ import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhUserMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
 import com.xunmei.core.safetybook.service.ICoreSafetyBookAqbwbndjhService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +50,10 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
         } else {
             page = new Page<>();
         }
-
+        SysOrg org = orgService.selectOrgById(coreSafetyBookAqbwbndjh.getOrgId() != null ? coreSafetyBookAqbwbndjh.getOrgId() : SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        if (org != null) {
+            coreSafetyBookAqbwbndjh.setSelectOrgPath(org.getPath());
+        }
         //获取数据
         page = coreSafetyBookAqbwbndjhMapper.selectAqbwbndjhPage(page, coreSafetyBookAqbwbndjh);
         //抓换为TableDataInfo适配前端

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookHsggbsdjServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.core.safetybook.service.impl;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
@@ -11,6 +12,7 @@ import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
 import com.xunmei.core.safetybook.service.ICoreSafetyBookHsggbsdjService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +49,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
         } else {
             page = new Page<>();
         }
+        SysOrg org = orgService.selectOrgById(coreSafetyBookHsggbsdj.getOrgId() != null ? coreSafetyBookHsggbsdj.getOrgId() : SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        if (org != null) {
+            coreSafetyBookHsggbsdj.setSelectOrgPath(org.getPath());
+        }
         //获取数据
         page = coreSafetyBookHsggbsdjMapper.selectHsggbsdjPage(page, coreSafetyBookHsggbsdj);
         //抓换为TableDataInfo适配前端

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookAqbwbndjhMapper.xml

@@ -91,7 +91,12 @@
             <if test="aq.range!=null and aq.range.size >1">
                 and  a.date <![CDATA[>=]]>  #{aq.range[0]} and a.date  <![CDATA[<=]]> #{aq.range[1]}
             </if>
-
+            <if test="aq.checkSub ==true">
+                and o.path like concat(#{aq.selectOrgPath},'%')
+            </if>
+            <if test="aq.checkSub ==false">
+                and o.path = #{aq.selectOrgPath}
+            </if>
         </where>
         group by a.id,a.create_time
         order by a.create_time desc

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookHsggbsdjMapper.xml

@@ -84,6 +84,12 @@
             <if test="hs.range!=null and hs.range.size >1">
                 and  h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
             </if>
+            <if test="hs.checkSub ==true">
+                and o.path like concat(#{hs.selectOrgPath},'%')
+            </if>
+            <if test="hs.checkSub ==false">
+                and o.path = #{hs.selectOrgPath}
+            </if>
         </where>
         GROUP BY
         h.id

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookMapper.xml

@@ -86,8 +86,6 @@
         </if>
         <if test="info.checkSub ==false">
             and o.path = #{info.selectOrgPath}
-
-
         </if>
     </select>
     <select id="selectBookById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBook">