Merge remote-tracking branch 'origin/master'

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

@@ -26,6 +26,7 @@ public class LawenforcementRecord{
      * 任务ID
      */
     private String id;
+    private String personCode;
 
     /**
      * 任务类型

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

@@ -334,6 +334,8 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         if (null == record.getCreatorId() || record.getCreatorId().isEmpty()) {
             record.setCreatorId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
         }
+        Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getCreatorId());
+        record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
         List<LawenforcementRecord> recordList = recordMapper.getRecordList(record);
         return recordList;
     }

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

@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectLawenforcementCaseList" parameterType="LawenforcementCase" resultMap="LawenforcementCaseResult">
         <include refid="selectLawenforcementCaseVo"/>
-        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         <where>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="recordId != null  and recordId != ''"> and record_id = #{recordId}</if>
@@ -48,7 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="punishType != null  and punishType != ''"> and punish_type = #{punishType}</if>
             <if test="describe != null  and describe != ''"> and `describe` = #{describe}</if>
             <if test="state != null  and state != ''"> and state = #{state}</if>
-            ${params.dataScope}
         </where>
         order by a.create_time desc
     </select>

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

@@ -560,8 +560,8 @@
             <if test="jobName != null and jobName != ''">
                 and job_name LIKE concat('%', #{jobName}, '%')
             </if>
-            <if test="creatorId != null and creatorId !=''">
-                and lp.person_id = #{creatorId}
+            <if test="personCode != null and personCode !=''">
+                and lp.person_code = #{personCode}
             </if>
             <if test="recordStatus != null and recordStatus != ''">
                 <if test="recordStatus == 'lawenforcement_type_1'">

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

@@ -249,7 +249,7 @@
         WHERE 1=1
         <choose>
             <when test="deviceId != null and deviceId != ''">
-                and a.device_id = #{deviceId}
+                and c.device_id = #{deviceId}
             </when>
             <otherwise>and a.record_status in ('lawenforcement_type_4','lawenforcement_type_6')</otherwise>
         </choose>