Merge remote-tracking branch 'origin/master'

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -15,6 +15,7 @@ import com.zdxt.code.domain.*;
 import com.zdxt.code.mapper.LinkageDictMapper;
 import com.zdxt.code.service.ILawEnforcementWarningListService;
 import com.zdxt.code.service.IRuleItemListService;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.config.RuoYiConfig;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.util.StringUtils;
@@ -109,6 +110,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
      * @return 执法端-执法登记
      */
     @Override
+    @DataScope
     public List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> enforcementRegistrations =

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -113,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and DATE_FORMAT(create_time,'%Y-%m') <= #{endTime}
             </if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by create_time desc
     </select>