1

src/main/java/com/sooka/sponest/lawenforcement/provincialDept/controller/LawenforcementProvincialDeptController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.lawenforcement.provincialDept.domain.LawenforcementProvincialDept;
 import com.sooka.sponest.lawenforcement.provincialDept.service.ILawenforcementProvincialDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,4 +101,10 @@ public class LawenforcementProvincialDeptController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] deptIds) {
         return toAjax(lawenforcementProvincialDeptService.deleteLawenforcementProvincialDeptByIds(deptIds));
     }
+
+    @GetMapping("/getProvincialDeptByAuth")
+    public AjaxResult getProvincialDeptByAuth(LawenforcementProvincialDept lawenforcementProvincialDept) {
+        lawenforcementProvincialDept.setDataDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        return AjaxResult.success(lawenforcementProvincialDeptService.selectLawenforcementProvincialDeptList(lawenforcementProvincialDept));
+    }
 }

src/main/java/com/sooka/sponest/lawenforcement/provincialDept/domain/LawenforcementProvincialDept.java

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.ibatis.type.Alias;
 
+import java.util.List;
+
 /**
  * 省平台部门与态势感知部门绑定对象 lawenforcement_provincial_dept
  *
@@ -24,11 +26,6 @@ public class LawenforcementProvincialDept extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 数据id
-     */
-    private Long id;
-
-    /**
      * 省平台部门名称
      */
     @Excel(name = "省平台部门名称")
@@ -55,7 +52,6 @@ public class LawenforcementProvincialDept extends BaseBusinessEntity {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
                 .append("provincialDeptName", getProvincialDeptName())
                 .append("deptName", getDeptName())
                 .append("deptId", getDeptId())

src/main/java/com/sooka/sponest/lawenforcement/provincialDept/service/impl/LawenforcementProvincialDeptServiceImpl.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.lawenforcement.provincialDept.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.datascope.base.service.BaseService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.lawenforcement.provincialDept.domain.LawenforcementProvincialDept;
 import com.sooka.sponest.lawenforcement.provincialDept.mapper.LawenforcementProvincialDeptMapper;
 import com.sooka.sponest.lawenforcement.provincialDept.service.ILawenforcementProvincialDeptService;
@@ -39,6 +40,7 @@ public class LawenforcementProvincialDeptServiceImpl extends BaseService impleme
      */
     @Override
     public List<LawenforcementProvincialDept> selectLawenforcementProvincialDeptList(LawenforcementProvincialDept lawenforcementProvincialDept) {
+//        lawenforcementProvincialDept.setDataDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         return lawenforcementProvincialDeptMapper.selectLawenforcementProvincialDeptList(lawenforcementProvincialDept);
     }
 

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -57,6 +57,8 @@ public class LawenforcementRecord{
     @Excel(name = "任务创建部门名称")
     private String deptName;
 
+    private List<String> deptNameList;
+
     /**
      * 地区ID
      */

src/main/resources/mapper/lawenforcement/LawenforcementProvincialDeptMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="provincialDeptName != null  and provincialDeptName != ''"> and provincial_dept_name like concat('%', #{provincialDeptName}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+             <if test="dataDeptId != null "> and (dept_id = #{dataDeptId} or find_in_set( #{dataDeptId}, dept_ancestors ))</if>
         </where>
     </select>
     

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -344,10 +344,11 @@
                lss.standard_name,lss.standard_code,lss.check_result,lss.check_result_type,lss.decision_reason,
                lss.result_personId,lss.fill_time as standard_fill_time,lss.is_proof_out,lss.remark as standard_remark
         FROM lawenforcement_record lr
+                 left join lawenforcement_provincial_dept d on lr.dept_id = d.provincial_dept_id
                  LEFT JOIN lawenforcement_person lp on lr.id = lp.record_id
                  LEFT JOIN lawenforcement_subitem ls on lr.id = ls.record_id
                  LEFT JOIN lawenforcement_standard lss on  ls.id = lss.subitem_id
-        WHERE lr.id = #{id}
+        WHERE lr.id = #{id} and (d.dept_id = #{deptId} or find_in_set( #{deptId}, d.dept_ancestors ))
     </select>
 
     <select id="getDetailLog" parameterType="string" resultMap="recordLogDetailResult">