1

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -86,7 +86,6 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
      */
     @Override
     public List<LawenforcementRecord> selectLawenforcementRecordList(LawenforcementRecord lawenforcementRecord) {
-        lawenforcementRecord.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
         return recordMapper.selectLawenforcementRecordList(lawenforcementRecord);
     }
 

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

@@ -297,7 +297,6 @@
                a.verify_people_name, a.verify_time, a.evaluation, a.evaluation_content, a.evaluation_time, a.result, a.result_time, a.result_person_id, a.status, a.create_time, a.create_by,
                a.is_last, a.job_id, a.last_job_type, a.source, a.create_method, a.is_cross_dept, a.device_id, a.device_name, a.record_status, a.is_register
         from lawenforcement_record a
-        left join lawenforcement_provincial_dept d on a.dept_id = d.provincial_dept_id
         <where>
             <if test="jobName != null  and jobName != ''">and a.job_name like concat('%', #{jobName}, '%')</if>
             <if test="jobType != null  and jobType != ''">and a.job_type like concat('%', #{jobType}, '%')</if>
@@ -322,9 +321,6 @@
                     </otherwise>
                 </choose>
             </if>
-            <if test="deptId !=null and deptId != ''">
-                and (d.dept_id = #{deptId} or find_in_set( #{deptId}, d.dept_ancestors ))
-            </if>
         </where>
         order by a.create_time desc
     </select>
@@ -344,11 +340,10 @@
                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} and (d.dept_id = #{deptId} or find_in_set( #{deptId}, d.dept_ancestors ))
+        WHERE lr.id = #{id}
     </select>
 
     <select id="getDetailLog" parameterType="string" resultMap="recordLogDetailResult">