Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer

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

@@ -72,12 +72,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId, String enterpriseId, Set<String> clerkCodeList) {
-        return mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList);
+        return  this.filterDelClerkList(mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList));
     }
 
     @Override
     public List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId) {
-        return  mapper.listBindCodeByStaffId(enterpriseIdList, staffId);
+        return  this.filterDelClerkList(mapper.listBindCodeByStaffId(enterpriseIdList, staffId));
     }
 
     @Override
@@ -218,7 +218,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId) {
-        return mapper.getOneByClerkId(clerkId, wxEnterpriseId);
+        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, wxEnterpriseId));
     }
 
     @Override
@@ -259,12 +259,13 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId) {
-        return mapper.getOneByStoreIdAndStaffId(storeId,staffId);
+        StaffClerkRelationDTO dto = this.filterDelClerk(mapper.getOneByStoreIdAndStaffId(storeId,staffId));
+        return dto ;
     }
 
     @Override
     public StaffClerkRelationDTO getByClerkId(String clerkId) {
-        return mapper.getOneByClerkId(clerkId, null);
+        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, null));
     }
 
     @Override
@@ -390,6 +391,33 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listManageBindByStaffId(String staffId) {
-        return mapper.listManageBindByStaffId(staffId);
+        return this.filterDelClerkList(mapper.listManageBindByStaffId(staffId));
+    }
+    
+    private List<StaffClerkRelationDTO> filterDelClerkList(List<StaffClerkRelationDTO> list) {
+        if(CollectionUtils.isEmpty(list)) {
+            return list ;
+        }
+        List<StaffClerkRelationDTO> retList = new ArrayList<>() ;
+        for(StaffClerkRelationDTO item : list) {
+            String clerkId = item.getClerkId() ;
+            ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+            if(null != clerk && clerk.getStatus() == 1) {
+                retList.add(item) ;
+            }
+        }
+        return retList ;
+    }
+    
+    private StaffClerkRelationDTO filterDelClerk(StaffClerkRelationDTO dto) {
+        if(null == dto) {
+            return dto ;
+        }
+        String clerkId = dto.getClerkId() ;
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        if(null == clerk || clerk.getStatus() == 1) {
+            dto = null ;
+        }
+        return dto ;
     }
 }

haoban-manage3-wx/src/main/webapp/third_callback.html

@@ -8,7 +8,7 @@
 	
 	//授权页面跳转
 	$(function(){
-        var returnUlr = "pages/workbench/workbench";
+        var returnUlr = "/pages/workbench/workbench";
         console.log(returnUlr)
         return wx.miniProgram.redirectTo({
             url : returnUlr,