Merge remote-tracking branch 'origin/master'

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

@@ -284,8 +284,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"));
+        /*Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getCreatorId());
+        record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));*/
         //查询任务集合
         List<LawenforcementRecord> recordList = recordMapper.getRecordList(record);
         //处理工单状态

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

@@ -578,8 +578,8 @@
             <if test="jobName != null and jobName != ''">
                 and job_name LIKE concat('%', #{jobName}, '%')
             </if>
-            <if test="personCode != null and personCode !=''">
-                and lp.person_code = #{personCode}
+            <if test="creatorId != null and creatorId !=''">
+                and lp.person_code = (select certificate_number as personCode from lawenforcement_user where user_id = #{creatorId})
             </if>
             <if test="recordStatus != null and recordStatus != ''">
                 <if test="recordStatus == 'lawenforcement_type_1'">