diff --git a/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java b/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java index 845c260..d4ef933 100644 --- a/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java @@ -170,7 +170,7 @@ public class PublicLeaderHandleServiceImpl extends BaseService implements IPubli LOG.debug("处理失败,上报领导"); publicLogService.savePublicLogSimple(token, publicLeaderHandleVO.getPublicAreaReportId(), publicLeaderHandleId, "处理失败,上报上级处理", userName); // 领导处理 - GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getLeader(params.get("creator").toString(), 0); + GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getLeader(params.get("modifier").toString(), 0); if (gridPersonnelDTO == null) { throw new SaveException("非处理人,上报失败"); } diff --git a/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml b/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml index 807650b..3495a43 100644 --- a/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml +++ b/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml @@ -137,7 +137,11 @@ WHERE t1.is_delete = 0 - + AND ( + t1.check_address LIKE CONCAT('%', #{keywords}, '%') + OR + t1.check_content LIKE CONCAT('%', #{keywords}, '%') + ) AND diff --git a/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml b/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml index 94515c8..03f0b9a 100644 --- a/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml +++ b/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml @@ -177,6 +177,8 @@ #{publicLogIds[${index}]} + ORDER BY + t1.id desc