Merge remote-tracking branch 'origin/developer' into developer

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

@@ -96,10 +96,21 @@ public class AuditController extends WebBaseController {
 
     }
 
-    //解绑记录列表
+    /**
+     *
+     * @param wxEnterpriseId 微信企业Id
+     * @param clerkCode 导购Id
+     * @param enterpriseId 企业Id
+     * @param optType 操作类型 0 绑定 1解绑 默认传 1
+     * @param pageInfo 页面
+     * @return
+     */
     @RequestMapping("clerk-unbind-list")
-    public HaobanResponse staffUnbindList(String wxEnterpriseId, String search, String enterpriseId, @RequestParam(defaultValue = "1") Integer optType, BasePageInfo qo) {
-        Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(wxEnterpriseId, search, enterpriseId, optType, qo);
+    public HaobanResponse staffUnbindList(String wxEnterpriseId, String clerkCode, String enterpriseId, @RequestParam(defaultValue = "1") Integer optType, BasePageInfo pageInfo) {
+        Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(wxEnterpriseId, clerkCode, enterpriseId, optType, pageInfo);
+        if (page == null) {
+            return resultResponse(HaoBanErrCode.ERR_8);
+        }
         List<StaffClerkBindLogDetailDTO> list = page.getResult();
         List<StaffClerkBindLogDetailVO> voList = new ArrayList<StaffClerkBindLogDetailVO>();
         for (StaffClerkBindLogDetailDTO staffClerkBindLogDetailDTO : list) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffClerkBindLogDetailVO.java

@@ -21,6 +21,8 @@ public class StaffClerkBindLogDetailVO implements Serializable{
 
     private String clerkPhoneNumber;
 
+    private String clerkCode;
+
     private String wxEnterpriseId;
 
     private Integer channelCode;
@@ -66,6 +68,10 @@ public class StaffClerkBindLogDetailVO implements Serializable{
 
     public void setClerkPhoneNumber(String clerkPhoneNumber) { this.clerkPhoneNumber = clerkPhoneNumber; }
 
+    public String getClerkCode() { return clerkCode; }
+
+    public void setClerkCode(String clerkCode) { this.clerkCode = clerkCode; }
+
     public String getWxEnterpriseId() { return wxEnterpriseId; }
 
     public void setWxEnterpriseId(String wxEnterpriseId) { this.wxEnterpriseId = wxEnterpriseId; }