完善

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java

@@ -68,6 +68,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     public PageData<IcWorkLogDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        params.put("createdBy", loginUserUtil.getLoginUserId());
         IPage<IcWorkLogDTO> page = getPage(params);
         List<IcWorkLogDTO> list = baseDao.listPage(params);
         return new PageData<>(list, page.getTotal());
@@ -83,6 +84,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     public List<IcWorkLogDTO> list4Export(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        params.put("createdBy", loginUserUtil.getLoginUserId());
         List<IcWorkLogDTO> list = baseDao.list4Export(params);
         Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode());
         if (!result.success() || null == result.getData()) {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml

@@ -42,11 +42,14 @@
             AND wl.GRID_ID = #{gridId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND wl.AGENCY_ID = #{agencyId}
+            AND FIND_IN_SET( #{agencyId}, wl.pids )
         </if>
         <if test="mobile != null and mobile != '' ">
             AND wl.MOBILE = #{mobile}
         </if>
+        <if test="isSelf != null and isSelf != '' and isSelf == '1' ">
+            AND wl.CREATED_BY = #{createdBy}
+        </if>
         <if test="startTime != null and startTime != '' ">
             AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime}
         </if>
@@ -85,11 +88,14 @@
             AND wl.GRID_ID = #{gridId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND wl.AGENCY_ID = #{agencyId}
+            AND FIND_IN_SET( #{agencyId}, wl.pids )
         </if>
         <if test="mobile != null and mobile != '' ">
             AND wl.MOBILE = #{mobile}
         </if>
+        <if test="isSelf != null and isSelf != '' and isSelf == '1' ">
+            AND wl.CREATED_BY = #{createdBy}
+        </if>
         <if test="startTime != null and startTime != '' ">
             AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime}
         </if>