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

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 
+
 public interface StaffDepartmentRelatedApiService {
 
     List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);

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

@@ -52,6 +52,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 
+
 @RestController
 public class StaffController extends WebBaseController{
 	private static Logger logger  = LoggerFactory.getLogger(StaffController.class);
@@ -135,7 +136,7 @@ public class StaffController extends WebBaseController{
 		List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
 		Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,activeFlag,keyWord,pageInfo);
 		List<StaffDTO> list = page.getResult();
-		
+		logger.info("pages={},totalPage={}",page.getCurrentPage(),page.getTotalPage());
 		PageResult<StaffDTO> pageVo = new PageResult<>();
         pageVo.setList(list);
         pageVo.setPageNum(page.getCurrentPage());
@@ -244,6 +245,7 @@ public class StaffController extends WebBaseController{
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
+	
 
 	@RequestMapping("get-clerk-info")
 	public HaobanResponse getClerkInfo(String clerkId){
@@ -261,7 +263,6 @@ public class StaffController extends WebBaseController{
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,staffVO);
 	}
-	
 
 	@RequestMapping("get-staff-info")
 	public HaobanResponse getStaffInfo(String staffId){