绑定日志

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffClerkBindLogMapper.java

@@ -27,8 +27,8 @@ public interface StaffClerkBindLogMapper {
      * @param optType
      * @return
      */
-    public List<TabHaobanStaffClerkBindLog> listStaffClerkBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("clerkIds") List<String> clerkIds
-            , @Param("staffIds") List<String> staffIds, @Param("enterpriseId") String enterpriseId, @Param("optType") int optType, @Param("search") String search);
+    public List<TabHaobanStaffClerkBindLog> listStaffClerkBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, 
+             @Param("enterpriseId") String enterpriseId, @Param("optType") int optType, @Param("search") String search);
 
     public List<TabHaobanStaffClerkBindLog> staffClerkUnBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("clerkId") String clerkIds
             , @Param("enterpriseId") String enterpriseIds, @Param("optType") int optType);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkBindLogService.java

@@ -44,7 +44,7 @@ public interface StaffClerkBindLogService {
     /**
      * @return
      */
-    public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, List<String> clerkIds, List<String> staffIds, String enterpriseId, int optType, String search, BasePageInfo pageInfo);
+    public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, String enterpriseId, int optType, String search, BasePageInfo pageInfo);
 
     public Page<StaffClerkBindLogDetailDTO> pageUnBindLog(String wxEnterpriseId, String clerkId, String enterpriseId, int optType, BasePageInfo pageInfo);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkBindLogServiceImpl.java

@@ -85,9 +85,9 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService {
     }
 
     @Override
-    public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, List<String> clerkIds, List<String> staffIds, String enterpriseId, int optType, String search, BasePageInfo pageInfo) {
+    public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, String enterpriseId, int optType, String search, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
-        List<TabHaobanStaffClerkBindLog> clerkBindLogList = staffClerkBindLogMapper.listStaffClerkBindLog(wxEnterpriseId, clerkIds, staffIds, enterpriseId, optType, search);
+        List<TabHaobanStaffClerkBindLog> clerkBindLogList = staffClerkBindLogMapper.listStaffClerkBindLog(wxEnterpriseId, enterpriseId, optType, search);
         Page<StaffClerkBindLogDetailDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindLogList), StaffClerkBindLogDetailDTO.class);
         return retPage;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -301,7 +301,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     @Override
     public Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo) {
-        Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, null, null, enterpriseId, optType, search, pageInfo);
+        Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, enterpriseId, optType, search, pageInfo);
         if (CollectionUtils.isNotEmpty(retList.getResult())) {
             retList.getResult().forEach(staffClerkBindLogDetailDTO -> {
                 TabHaobanStaff haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getStaffId());

haoban-manage3-service/src/main/resources/mapper/StaffClerkBindLogMapper.xml

@@ -47,19 +47,6 @@
         <include refid="Base_Column_List"/>
         from tab_haoban_staff_clerk_bind_log
         where wx_enterprise_id=#{wxEnterpriseId}  and enterprise_id = #{enterpriseId} 
-        <if test="clerkIds!=null and clerkIds.size()>0">
-            and clerk_id in
-            <foreach collection="clerkIds" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="staffIds!=null and staffIds.size()>0">
-            and staff_id in
-            <foreach collection="staffIds" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-           
         <if test="optType!=-1">
             and opt_type=#{optType}
         </if>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -447,8 +447,9 @@ public class StaffController extends WebBaseController {
      * @return
      */
     @RequestMapping("staff-clerk-bind-log")
-    public HaobanResponse bindLogs(String search, String enterpriseId, @RequestParam(defaultValue = "-1") Integer optType, BasePageInfo qo) {
+    public HaobanResponse bindLogs(String search, @RequestParam(defaultValue = "-1") Integer optType, BasePageInfo qo) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String enterpriseId = login.getEnterpriseId() ;
         Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(login.getWxEnterpriseId(), search, enterpriseId, optType, qo);
         return resultResponse(HaoBanErrCode.ERR_1, page);
     }